feat: support list Qt 6.8.0 windows_arm64

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

Author: miurahr

aqt/archives.py

@@ -380,12 +380,12 @@ 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":
+        elif os_name != "linux_arm64" and os_name != "all_os" and os_name != "windows_arm64":
             os_name += "_x64"
         if self.target == "android" and self.version >= Version("6.7.0"):
             os_name = "all_os"
         #
-        if os_name == "windows_x86" and self.version >= Version("6.8.0"):
+        if os_name in ("windows_x86", "windows_arm64") and self.version >= Version("6.8.0"):
             os_target_folder = posixpath.join(
                 "online/qtsdkrepository",
                 os_name,

aqt/installer.py

@@ -280,6 +280,8 @@ def _set_arch(arch: Optional[str], os_name: str, target: str, qt_version_or_spec
                     return "android"
             except ValueError:
                 pass
+        elif os_name == "windows_arm64" and target == "desktop":
+            return "windows_msvc2022_arm64"
         raise CliInputError("Please supply a target architecture.", should_show_help=True)
 
     def _check_mirror(self, mirror):
@@ -747,7 +749,7 @@ def _set_install_qt_parser(self, install_qt_parser, *, is_legacy: bool):
 
     def _set_install_tool_parser(self, install_tool_parser, *, is_legacy: bool):
         install_tool_parser.set_defaults(func=self.run_install_tool, is_legacy=is_legacy)
-        install_tool_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
+        install_tool_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
         if not is_legacy:
             install_tool_parser.add_argument(
                 "target",
@@ -804,7 +806,7 @@ def make_parser_sde(cmd: str, desc: str, is_legacy: bool, action, is_add_kde: bo
 
         def make_parser_list_sde(cmd: str, desc: str, cmd_type: str):
             parser = subparsers.add_parser(cmd, description=desc)
-            parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
+            parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
             parser.add_argument(
                 "qt_version_spec",
                 metavar="(VERSION | SPECIFICATION)",
@@ -852,7 +854,7 @@ def _make_list_qt_parser(self, subparsers: argparse._SubParsersAction):
             "$ aqt list-qt mac desktop --archives 5.9.0 clang_64              # list archives in base Qt installation\n"
             "$ aqt list-qt mac desktop --archives 5.14.0 clang_64 debug_info  # list archives in debug_info module\n",
         )
-        list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
+        list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
         list_parser.add_argument(
             "target",
             nargs="?",
@@ -936,7 +938,7 @@ def _make_list_tool_parser(self, subparsers: argparse._SubParsersAction):
             "$ aqt list-tool mac desktop tools_ifw --long  # print tool variant names with metadata for QtIFW\n"
             "$ aqt list-tool mac desktop ifw --long        # print tool variant names with metadata for QtIFW\n",
         )
-        list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
+        list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
         list_parser.add_argument(
             "target",
             nargs="?",
@@ -1023,7 +1025,7 @@ def _set_common_arguments(self, subparser, *, is_legacy: bool, is_target_depreca
         """
         if is_legacy:
             subparser.add_argument("qt_version", help='Qt version in the format of "5.X.Y"')
-        subparser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
+        subparser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows", "windows_arm64"], help="host os name")
         if is_target_deprecated:
             subparser.add_argument(
                 "target",

aqt/metadata.py

@@ -199,9 +199,10 @@ def get_semantic_version(qt_ver: str, is_preview: bool) -> Optional[Version]:
 
 class ArchiveId:
     CATEGORIES = ("tools", "qt")
-    HOSTS = ("windows", "mac", "linux", "linux_arm64", "all_os")
+    HOSTS = ("windows", "windows_arm64", "mac", "linux", "linux_arm64", "all_os")
     TARGETS_FOR_HOST = {
         "windows": ["android", "desktop", "winrt"],
+        "windows_arm64": ["desktop"],
         "mac": ["android", "desktop", "ios"],
         "linux": ["android", "desktop"],
         "linux_arm64": ["desktop"],
@@ -233,7 +234,7 @@ def is_tools(self) -> bool:
     def to_url(self) -> str:
         return "online/qtsdkrepository/{os}{arch}/{target}/".format(
             os=self.host,
-            arch=("_x86" if self.host == "windows" else ("" if self.host in ("linux_arm64", "all_os") else "_x64")),
+            arch=("_x86" if self.host == "windows" else ("" if self.host in ("linux_arm64", "all_os", "windows_arm64") else "_x64")),
             target=self.target,
         )
 
@@ -957,7 +958,10 @@ def fetch_default_desktop_arch(self, version: Version, is_msvc: bool = False) ->
         elif self.archive_id.host == "mac":
             return "clang_64"
         elif self.archive_id.host == "windows" and is_msvc:
-            return "win64_msvc2019_64"
+            if version >= Version("6.8.0"):
+                return "win64_msvc2022_64"
+            else:
+                return "win64_msvc2019_64"
         arches = [arch for arch in self.fetch_arches(version) if QtRepoProperty.MINGW_ARCH_PATTERN.match(arch)]
         selected_arch = QtRepoProperty.select_default_mingw(arches, is_dir=False)
         if not selected_arch: