Merge branch 'master' of https://github.com/miurahr/aqtinstall

miurahr · Jun 18, 2020 · 8a81edb · 8a81edb
2 parents b6631dc + 068c3c6
commit 8a81edb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,8 @@ Current changes
 Added
 -----
 
+* Add Qt6 as a known version.
+
 Changed
 -------
 

diff --git a/aqt/archives.py b/aqt/archives.py
@@ -81,26 +81,27 @@ def __init__(self, os_name, target, version, arch, subarchives=None,
         self.archives = []
         self.mod_list = []
         qt_ver_num = self.version.replace(".", "")
+        self.qt_ver_base = self.version[0:1]
         if all_extra:
             self.all_extra = True
         else:
             for m in modules if modules is not None else []:
-                self.mod_list.append("qt.qt5.{}.{}.{}".format(qt_ver_num, m, arch))
+                self.mod_list.append("qt.qt{}.{}.{}.{}".format(self.qt_ver_base, qt_ver_num, m, arch))
                 self.mod_list.append("qt.{}.{}.{}".format(qt_ver_num, m, arch))
         self._get_archives(qt_ver_num)
         if not all_archives:
             self.archives = list(filter(lambda a: a.name in subarchives, self.archives))
 
     def _get_archives(self, qt_ver_num):
         # Get packages index
-        archive_path = "{0}{1}{2}/qt5_{3}{4}".format(self.os_name,
-                                                     '_x86/' if self.os_name == 'windows' else '_x64/',
-                                                     self.target, qt_ver_num,
-                                                     '_wasm/' if self.arch == 'wasm_32' else '/')
+        archive_path = "{0}{1}{2}/qt{3}_{4}{5}".format(self.os_name,
+                                                       '_x86/' if self.os_name == 'windows' else '_x64/',
+                                                       self.target, self.qt_ver_base, qt_ver_num,
+                                                       '_wasm/' if self.arch == 'wasm_32' else '/')
         update_xml_url = "{0}{1}Updates.xml".format(self.base, archive_path)
         archive_url = "{0}{1}".format(self.base, archive_path)
         target_packages = []
-        target_packages.append("qt.qt5.{}.{}".format(qt_ver_num, self.arch))
+        target_packages.append("qt.qt{}.{}.{}".format(self.qt_ver_base, qt_ver_num, self.arch))
         target_packages.append("qt.{}.{}".format(qt_ver_num, self.arch))
         target_packages.extend(self.mod_list)
         self._download_update_xml(update_xml_url)
@@ -175,13 +176,14 @@ def __init__(self, flavor, os_name, target, version, subarchives=None,
                                                      all_extra=all_extra)
 
     def _get_archives(self, qt_ver_num):
-        archive_path = "{0}{1}{2}/qt5_{3}{4}".format(self.os_name,
-                                                     '_x86/' if self.os_name == 'windows' else '_x64/',
-                                                     self.target, qt_ver_num, '_src_doc_examples/')
+        archive_path = "{0}{1}{2}/qt{3}_{4}{5}".format(self.os_name,
+                                                       '_x86/' if self.os_name == 'windows' else '_x64/',
+                                                       self.target, self.qt_ver_base, qt_ver_num,
+                                                       '_src_doc_examples/')
         archive_url = "{0}{1}".format(self.base, archive_path)
         update_xml_url = "{0}/Updates.xml".format(archive_url)
         target_packages = []
-        target_packages.append("qt.qt5.{}.{}".format(qt_ver_num, self.flavor))
+        target_packages.append("qt.qt{}.{}.{}".format(self.qt_ver_base, qt_ver_num, self.flavor))
         target_packages.extend(self.mod_list)
         self._download_update_xml(update_xml_url)
         self._parse_update_xml(archive_url, target_packages)

diff --git a/aqt/combinations.json b/aqt/combinations.json
@@ -104,13 +104,15 @@
   {"qt_version": "5.14", "modules": ["qtcharts", "qtlottie", "qtnetworkauth", "qtpurchasing", "qtdatavis3d",
     "qtquick3d", "qtquicktimeline", "qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]},
   {"qt_version": "5.15", "modules": ["qtcharts", "qtlottie", "qtnetworkauth", "qtpurchasing", "qtdatavis3d",
-    "qtquick3d", "qtquicktimeline", "qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]}
+    "qtquick3d", "qtquicktimeline", "qtscript", "qtvirtualkeyboard", "qtwebengine", "qtwebglplugin"]},
+  {"qt_version":  "6.0", "modules": ["qtnetworkauth"]}
 ], "versions": [
   "5.5", "5.6", "5.7", "5.8",
   "5.9", "5.9.1", "5.9.2", "5.9.3", "5.9.4", "5.9.5", "5.9.6", "5.9.7", "5.9.8", "5.9.9",
   "5.10.0", "5.10.1", "5.11.0", "5.11.1", "5.11.2", "5.11.3",
   "5.12.0", "5.12.1", "5.12.2", "5.12.3", "5.12.4", "5.12.5", "5.12.6", "5.12.7",
   "5.13.0", "5.13.1", "5.13.2",
   "5.14.0", "5.14.1", "5.14.2",
-  "5.15.0"
+  "5.15.0",
+  "6.0"
 ]}]