From 9c0b40342518011f4e6451ff336301563e2afd17 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Tue, 16 Jun 2020 18:17:28 +0900 Subject: [PATCH 1/2] Add Qt6 as known version Signed-off-by: Hiroshi Miura --- CHANGELOG.rst | 2 ++ aqt/combinations.json | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4cec8e79..c7162fcf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,8 @@ Current changes Added ----- +* Add Qt6 as a known version. + Changed ------- diff --git a/aqt/combinations.json b/aqt/combinations.json index e47a546f..70e68280 100644 --- a/aqt/combinations.json +++ b/aqt/combinations.json @@ -104,7 +104,8 @@ {"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", @@ -112,5 +113,6 @@ "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" ]}] From b5a84acfad6ff1e9a2fe63a95c5421d9a1d4a995 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Fri, 19 Jun 2020 00:51:16 +0900 Subject: [PATCH 2/2] Can use qt6_ as an archive base name Signed-off-by: Hiroshi Miura --- aqt/archives.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/aqt/archives.py b/aqt/archives.py index faded12f..12f51d6f 100644 --- a/aqt/archives.py +++ b/aqt/archives.py @@ -81,11 +81,12 @@ 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: @@ -93,14 +94,14 @@ def __init__(self, os_name, target, version, arch, subarchives=None, 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)