Merge branch 'master' into topic/miurahr/drop-support-for-python37

.github/workflows/check.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 20
-    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+        fetch-tags: true
     - name: Set up Python 3.9
       uses: actions/setup-python@v4
       with:

.github/workflows/test-install-qt.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 20
-      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+          fetch-tags: true
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

aqt/archives.py

@@ -367,7 +367,7 @@ def _get_archives(self):
     def _append_depends_tool(self, arch, tool_name):
         os_target_folder = posixpath.join(
             "online/qtsdkrepository",
-            self.os_name + ("_x86" if self.os_name == "windows" else "_x64"),
+            self.os_name + ("_x86" if self.os_name == "windows" else ("" if self.os_name == "linux_arm64" else "_x64")),
             self.target,
             tool_name,
         )
@@ -379,7 +379,7 @@ def _append_depends_tool(self, arch, tool_name):
     def _get_archives_base(self, name, target_packages):
         os_target_folder = posixpath.join(
             "online/qtsdkrepository",
-            self.os_name + ("_x86" if self.os_name == "windows" else "_x64"),
+            self.os_name + ("_x86" if self.os_name == "windows" else ("" if self.os_name == "linux_arm64" else "_x64")),
             self.target,
             # tools_ifw/
             name,

aqt/combinations.json

@@ -318,6 +318,7 @@
           "qt3d",
           "qt3d.debug_information",
           "qt5compat",
+          "qt5compat.debug_information",
           "qtcharts",
           "qtcharts.debug_information",
           "qtconnectivity",
@@ -346,11 +347,13 @@
           "qtpositioning",
           "qtpositioning.debug_information",
           "qtquick3d",
+          "qtquick3d.debug_information",
           "qtquick3dphysics",
           "qtquick3dphysics.debug_information",
           "qtquickeffectmaker",
           "qtquickeffectmaker.debug_information",
           "qtquicktimeline",
+          "qtquicktimeline.debug_information",
           "qtremoteobjects",
           "qtremoteobjects.debug_information",
           "qtscxml",
@@ -362,11 +365,13 @@
           "qtserialport",
           "qtserialport.debug_information",
           "qtshadertools",
+          "qtshadertools.debug_information",
           "qtspeech",
           "qtspeech.debug_information",
           "qtvirtualkeyboard",
           "qtvirtualkeyboard.debug_information",
           "qtwaylandcompositor",
+          "qtwaylandcompositor.debug_information",
           "qtwebchannel",
           "qtwebchannel.debug_information",
           "qtwebengine",
@@ -434,6 +439,11 @@
         "os_name": "linux",
         "target": "desktop"
       },
+      {
+        "arch": "linux_gcc_arm64",
+        "os_name": "linux_arm64",
+        "target": "desktop"
+      },
       {
         "arch": "wasm_32",
         "os_name": "linux",
@@ -1293,7 +1303,8 @@
       "6.6.0",
       "6.6.1",
       "6.6.2",
+      "6.6.3",
       "6.7.0"
     ]
   }
-]
+]

aqt/installer.py

@@ -261,7 +261,15 @@ def _set_arch(arch: Optional[str], os_name: str, target: str, qt_version_or_spec
         if arch is not None and arch != "":
             return arch
         if os_name == "linux" and target == "desktop":
-            return "gcc_64"
+            try:
+                if Version(qt_version_or_spec) >= Version("6.7.0"):
+                    return "linux_gcc_64"
+                else:
+                    return "gcc_64"
+            except ValueError:
+                return "gcc_64"
+        elif os_name == "linux_arm64" and target == "desktop":
+            return "linux_gcc_arm64"
         elif os_name == "mac" and target == "desktop":
             return "clang_64"
         elif os_name == "mac" and target == "ios":
@@ -730,7 +738,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", "mac", "windows"], help="host os name")
+        install_tool_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
         if not is_legacy:
             install_tool_parser.add_argument(
                 "target",
@@ -787,7 +795,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", "mac", "windows"], help="host os name")
+            parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
             parser.add_argument(
                 "qt_version_spec",
                 metavar="(VERSION | SPECIFICATION)",
@@ -835,7 +843,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", "mac", "windows"], help="host os name")
+        list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
         list_parser.add_argument(
             "target",
             nargs="?",
@@ -919,7 +927,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", "mac", "windows"], help="host os name")
+        list_parser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
         list_parser.add_argument(
             "target",
             nargs="?",
@@ -1006,7 +1014,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", "mac", "windows"], help="host os name")
+        subparser.add_argument("host", choices=["linux", "linux_arm64", "mac", "windows"], help="host os name")
         if is_target_deprecated:
             subparser.add_argument(
                 "target",

aqt/metadata.py

@@ -199,11 +199,12 @@ def get_semantic_version(qt_ver: str, is_preview: bool) -> Optional[Version]:
 
 class ArchiveId:
     CATEGORIES = ("tools", "qt")
-    HOSTS = ("windows", "mac", "linux")
+    HOSTS = ("windows", "mac", "linux", "linux_arm64")
     TARGETS_FOR_HOST = {
         "windows": ["android", "desktop", "winrt"],
         "mac": ["android", "desktop", "ios"],
         "linux": ["android", "desktop"],
+        "linux_arm64": ["desktop"],
     }
     EXTENSIONS_REQUIRED_ANDROID_QT6 = {"x86_64", "x86", "armv7", "arm64_v8a"}
     ALL_EXTENSIONS = {"", "wasm", "src_doc_examples", *EXTENSIONS_REQUIRED_ANDROID_QT6}
@@ -231,7 +232,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 "_x64",
+            arch=("_x86" if self.host == "windows" else ("" if self.host == "linux_arm64" else "_x64")),
             target=self.target,
         )
 
@@ -384,12 +385,16 @@ def get_arch_dir_name(host: str, arch: str, version: Version) -> str:
                 return arch[6:]
         elif host == "mac" and arch == "clang_64":
             return QtRepoProperty.default_mac_desktop_arch_dir(version)
+        elif host == "linux" and arch in ("gcc_64", "linux_gcc_64"):
+            return "gcc_64"
+        elif host == "linux_arm64" and arch == "linux_gcc_arm64":
+            return "gcc_arm64"
         else:
             return arch
 
     @staticmethod
-    def default_linux_desktop_arch_dir() -> str:
-        return "gcc_64"
+    def default_linux_desktop_arch_dir() -> tuple[str, str]:
+        return ("gcc_64", "gcc_arm64")
 
     @staticmethod
     def default_win_msvc_desktop_arch_dir(_version: Version) -> str:
@@ -476,8 +481,11 @@ def find_installed_desktop_qt_dir(host: str, base_path: Path, version: Version,
             arch_path = installed_qt_version_dir / QtRepoProperty.default_mac_desktop_arch_dir(version)
             return arch_path if (arch_path / "bin/qmake").is_file() else None
         elif host == "linux":
-            arch_path = installed_qt_version_dir / QtRepoProperty.default_linux_desktop_arch_dir()
-            return arch_path if (arch_path / "bin/qmake").is_file() else None
+            for arch_dir in QtRepoProperty.default_linux_desktop_arch_dir():
+                arch_path = installed_qt_version_dir / arch_dir
+                if (arch_path / "bin/qmake").is_file():
+                    return arch_path
+            return None
         elif host == "windows" and is_msvc:
             arch_path = installed_qt_version_dir / QtRepoProperty.default_win_msvc_desktop_arch_dir(version)
             return arch_path if (arch_path / "bin/qmake.exe").is_file() else None
@@ -928,7 +936,12 @@ def describe_filters(self) -> str:
     def fetch_default_desktop_arch(self, version: Version, is_msvc: bool = False) -> str:
         assert self.archive_id.target == "desktop", "This function is meant to fetch desktop architectures"
         if self.archive_id.host == "linux":
-            return "gcc_64"
+            if version >= Version("6.7.0"):
+                return "linux_gcc_64"
+            else:
+                return "gcc_64"
+        elif self.archive_id.host == "linux_arm64":
+            return "linux_gcc_arm64"
         elif self.archive_id.host == "mac":
             return "clang_64"
         elif self.archive_id.host == "windows" and is_msvc:

azure-pipelines.yml

@@ -53,3 +53,15 @@ jobs:
     matrix: $[ dependencies.MatricesGenerator.outputs['mtrx.linux'] ]
   steps:
     - template: ci/steps.yml
+
+- job: Linux ARM64
+  dependsOn: MatricesGenerator
+  pool:
+    vmImage: 'ubuntu-22.04'
+  container:
+    image: ubuntu:22.04
+    options: --platform linux/arm64
+  strategy:
+    matrix: $[ dependencies.MatricesGenerator.outputs['mtrx.linux_arm64'] ]
+  steps:
+    - template: ci/steps.yml

ci/generate_azure_pipelines_matrices.py

@@ -92,11 +92,13 @@ def __init__(self, platform, build_jobs):
 qt_versions = ["5.12.12", "5.15.14", "6.5.3"]
 
 linux_build_jobs = []
+linux_arm64_build_jobs = []
 mac_build_jobs = []
 windows_build_jobs = []
 
 all_platform_build_jobs = [
     PlatformBuildJobs("linux", linux_build_jobs),
+    PlatformBuildJobs("linux_arm64", linux_arm64_build_jobs),
     PlatformBuildJobs("mac", mac_build_jobs),
     PlatformBuildJobs("windows", windows_build_jobs),
 ]
@@ -106,6 +108,7 @@ def __init__(self, platform, build_jobs):
     linux_build_jobs.append(
         BuildJob("install-qt", qt_version, "linux", "desktop", "gcc_64", "gcc_64")
     )
+linux_arm64_build_jobs.append(BuildJob("install-qt", "6.7.0", "linux_arm64", "desktop", "linux_gcc_arm64", "gcc_arm64"))
 
 # Mac Desktop
 for qt_version in qt_versions:
@@ -480,6 +483,9 @@ def __init__(self, platform, build_jobs):
 print(
     f"##vso[task.setVariable variable=linux;isOutput=true]{json.dumps(matrices['linux'])}"
 )
+print(
+    f"##vso[task.setVariable variable=linux_arm64;isOutput=true]{json.dumps(matrices['linux_arm64'])}"
+)
 print(
     f"##vso[task.setVariable variable=windows;isOutput=true]{json.dumps(matrices['windows'])}"
 )

docs/CHANGELOG.rst

@@ -17,6 +17,10 @@ Deprecated
 ----------
 * Drop support for python 3.7
 
+Added
+-----
+- Add support for arm64 architecture on linux desktop (#766)
+
 `v3.1.12`_ (2, Mar. 2024)
 =========================