Merge pull request #832 from jdpurcell/qt68winarmcc

Fix for arch win64_msvc2022_arm64_cross_compiled

aqt/installer.py

@@ -1050,7 +1050,9 @@ class Cli:
         """Returns expected_desktop_arch_dir, desktop_arch_to_install"""
         is_wasm = arch.startswith("wasm")
         is_msvc = "msvc" in arch
-        is_win_desktop_msvc_arm64 = host == "windows" and target == "desktop" and is_msvc and arch.endswith("arm64")
+        is_win_desktop_msvc_arm64 = (
+            host == "windows" and target == "desktop" and is_msvc and arch.endswith(("arm64", "arm64_cross_compiled"))
+        )
         if version < Version("6.0.0") or (
             target not in ["ios", "android"] and not is_wasm and not is_win_desktop_msvc_arm64
         ):

aqt/metadata.py

@@ -395,6 +395,8 @@ class QtRepoProperty:
             m = re.match(r"win\d{2}_(?P<msvc>msvc\d{4})_(?P<winrt>winrt_x\d{2})", arch)
             if m:
                 return f"{m.group('winrt')}_{m.group('msvc')}"
+            elif arch.endswith("_cross_compiled"):
+                return arch[6:-15]
             else:
                 return arch[6:]
         elif host == "mac" and arch == "clang_64":
@@ -412,7 +414,9 @@ class QtRepoProperty:
 
     @staticmethod
     def default_win_msvc_desktop_arch_dir(_version: Version) -> str:
-        """_version is unused, but we expect it to matter for future releases"""
+        if _version >= Version("6.8.0"):
+            return "msvc2022_64"
+        else:
             return "msvc2019_64"
 
     @staticmethod

aqt/updater.py

@@ -299,6 +299,7 @@ class Updater:
                 "android_x86",
                 "android_armv7",
                 "win64_msvc2019_arm64",
+                "win64_msvc2022_arm64_cross_compiled",
             ]:  # desktop version
                 updater.make_qtconf(base_dir, version_dir, arch_dir)
                 updater.patch_qmake()