Override host/target for src/docs if Qt >= 6.7.0

Fixes #775
miurahr · Apr 11, 2024 · 65501b1 · 65501b1
1 parent cf4bda9
commit 65501b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/aqt/archives.py b/aqt/archives.py
@@ -377,9 +377,14 @@ def _append_depends_tool(self, arch, tool_name):
         self._append_tool_update(os_target_folder, update_xml, arch, None)
 
     def _get_archives_base(self, name, target_packages):
+        os_name = self.os_name
+        if self.os_name == "windows":
+            os_name += "_x86"
+        elif os_name != "linux_arm64" and os_name != "all_os":
+            os_name += "_x64"
         os_target_folder = posixpath.join(
             "online/qtsdkrepository",
-            self.os_name + ("_x86" if self.os_name == "windows" else ("" if self.os_name == "linux_arm64" else "_x64")),
+            os_name,
             self.target,
             # tools_ifw/
             name,

diff --git a/aqt/installer.py b/aqt/installer.py
@@ -481,6 +481,10 @@ def _run_src_doc_examples(self, flavor, args, cmd_name: Optional[str] = None):
         else:
             qt_version = args.qt_version
             Cli._validate_version_str(qt_version)
+        # Override target/os for recent Qt
+        if Version(qt_version) >= Version("6.7.0"):
+            target = "qt"
+            os_name = "all_os"
         if args.timeout is not None:
             timeout = (args.timeout, args.timeout)
         else: