Merge branch 'master' into v4

Author: jurplel

.github/workflows/test.yml

@@ -96,6 +96,17 @@ jobs:
             qt:
               tools-only-build: true
               add-tools-to-path: false
+          - os: ubuntu-24.04-arm
+            qt:
+              version: "6.8.1"
+              requested: "6.8.1"
+              modules: qtwebengine qtpositioning qtwebchannel
+          - os: windows-11-arm
+            skip-test-project: true
+            qt:
+              version: "6.8.1"
+              requested: "6.8.1"
+              modules: qtpositioning qtwebchannel
 
 
     steps:
@@ -123,7 +134,7 @@ jobs:
           dir: ${{ matrix.dir }}
           modules: ${{ matrix.qt.modules }}
           version: ${{ matrix.qt.requested }}
-          tools: tools_ifw tools_qtcreator,qt.tools.qtcreator
+          tools: tools_qtcreator_gui,qt.tools.qtcreator_gui
           cache: ${{ matrix.cache == 'cached' }}
 
       - name: Install Qt with options and specified aqtversion
@@ -134,7 +145,7 @@ jobs:
           dir: ${{ matrix.dir }}
           modules: ${{ matrix.qt.modules }}
           version: ${{ matrix.qt.requested }}
-          tools: tools_ifw tools_qtcreator,qt.tools.qtcreator
+          tools: tools_qtcreator_gui,qt.tools.qtcreator_gui
           cache: ${{ matrix.cache == 'cached' }}
 
       - name: Test QT_ROOT_DIR
@@ -157,7 +168,7 @@ jobs:
           }
 
       - name: Configure test project on windows
-        if: ${{ matrix.qt.version && startsWith(matrix.os, 'windows') }}
+        if: ${{ matrix.qt.version && startsWith(matrix.os, 'windows') && !matrix.skip-test-project }}
         env:
           QT_VERSION: ${{ matrix.qt.version }}
         run: |
@@ -169,7 +180,7 @@ jobs:
         shell: cmd
 
       - name: Configure test project on unix
-        if: ${{ matrix.qt.version && !startsWith(matrix.os, 'windows') }}
+        if: ${{ matrix.qt.version && !startsWith(matrix.os, 'windows') && !matrix.skip-test-project }}
         env:
           QT_VERSION: ${{ matrix.qt.version }}
         run: |
@@ -228,7 +239,7 @@ jobs:
         with:
           dir: ${{ matrix.dir }}
           tools-only: true
-          tools: tools_ifw tools_qtcreator,qt.tools.qtcreator tools_cmake tools_ninja tools_conan
+          tools: tools_ifw tools_qtcreator_gui,qt.tools.qtcreator_gui tools_cmake tools_ninja tools_conan
           add-tools-to-path: ${{ matrix.qt.add-tools-to-path }}
           cache: ${{ matrix.cache == 'cached' }}
 
@@ -240,7 +251,7 @@ jobs:
           set -x
 
           # tools_ifw: use `archivegen` to test that Tools/QtInstallerFramework/4.7/bin is added to path
-          # tools_qtcreator: use `qbs` to test that Tools/QtCreator/bin or "Qt Creator.app/Contents/MacOS/" is added to path
+          # tools_qtcreator_gui: use `qbs` to test that Tools/QtCreator/bin or "Qt Creator.app/Contents/MacOS/" is added to path
           # tools_cmake: test that Tools/CMake/bin or Tools/CMake/CMake.app/Contents/bin is added to path
           # tools_ninja: test that Tools/Ninja is added to path
           # tools_conan: test that Tools/Conan is added to path
@@ -270,7 +281,7 @@ jobs:
           [[ -e "../Qt/Tools/Conan/conan" ]]
 
           # tools_ifw: use `archivegen` to test that Tools/QtInstallerFramework/4.7/bin is not added to path
-          # tools_qtcreator: use `qbs` to test that Tools/QtCreator/bin or "Qt Creator.app/Contents/MacOS/" is not added to path
+          # tools_qtcreator_gui: use `qbs` to test that Tools/QtCreator/bin or "Qt Creator.app/Contents/MacOS/" is not added to path
           # tools_cmake: test that Tools/CMake/bin or Tools/CMake/CMake.app/Contents/bin is not added to path
           # tools_ninja: test that Tools/Ninja is not added to path
           # tools_conan: test that Tools/Conan is not added to path

README.md

@@ -32,7 +32,7 @@ This is the host platform of the Qt version you will be installing. It's unlikel
 
 For example, if you are building on Linux and targeting desktop, you would set host to `linux`. If you are building on Linux and targeting android, you would set host to `linux` also. The host platform is the platform that your application will build on, not its target platform.
 
-Possible values: `windows`, `mac`, `linux` or `all_os`.  
+Possible values: `windows`, `windows_arm64`, `mac`, `linux`, `linux_arm64` or `all_os`.  
 `all_os` is used for wasm, and incompatible with `aqtinstall < 3.2.0`.  
 
 Defaults to the current platform it is being run on.  
@@ -68,6 +68,8 @@ Windows w/ Qt >= 5.15 && Qt < 6.8: `win64_msvc2019_64`
 
 Windows w/ Qt >= 6.8: `win64_msvc2022_64`
 
+Windows (ARM64) w/ Qt >= 6.8: `win64_msvc2022_arm64`
+
 Android: `android_armv7`
 
 ### `dir`
@@ -278,12 +280,12 @@ By default this is unset and ignored.
 
 Version of [aqtinstall](https://github.com/miurahr/aqtinstall) to use, given in the format used by pip, for example: `==0.7.1`, `>=0.7.1`, `==0.7.*`. This is intended to be used to troubleshoot any bugs that might be caused or fixed by certain versions of aqtinstall.
 
-Default: `==3.2.*`
+Default: `==3.3.*`
 
 ### `py7zrversion`
 Version of py7zr in the same style as the aqtversion and intended to be used for the same purpose.
 
-Default: `==0.22.*`
+Default: `==1.0.*`
 
 ### `extra`
 This input can be used to append arguments to the end of the aqtinstall command for any special purpose.
@@ -310,8 +312,8 @@ Example value: `--external 7z`
         tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator'
         set-env: 'true'
         tools-only: 'false'
-        aqtversion: '==3.2.*'
-        py7zrversion: '==0.22.*'
+        aqtversion: '==3.3.*'
+        py7zrversion: '==1.0.*'
         extra: '--external 7z'
         use-official: false
         email: ${{ secrets.QT_EMAIL }}

action.yml

@@ -55,10 +55,10 @@ inputs:
     description: Location to source aqtinstall from in case of issues
   aqtversion:
     description: Version of aqtinstall to use in case of issues
-    default: ==3.2.*
+    default: ==3.3.*
   py7zrversion:
     description: Version of py7zr to use in case of issues
-    default: ==0.22.*
+    default: ==1.0.*
   extra:
     description: Any extra arguments to append to the back
   source:
@@ -96,7 +96,7 @@ runs:
     if: ${{ inputs.setup-python  == 'true' }}
     uses: actions/setup-python@v5
     with:
-      python-version: '3.10.x - 3.12.x'
+      python-version: '3.9.x - 3.13.x'
 
   - name: Setup and run aqtinstall
     uses: jurplel/install-qt-action/action@v4

action/action.yml

@@ -52,10 +52,10 @@ inputs:
     description: Location to source aqtinstall from in case of issues
   aqtversion:
     description: Version of aqtinstall to use in case of issues
-    default: ==3.2.*
+    default: ==3.3.*
   py7zrversion:
     description: Version of py7zr to use in case of issues
-    default: ==0.22.*
+    default: ==1.0.*
   extra:
     description: Any extra arguments to append to the back
   source:

action/package-lock.json

@@ -72,21 +72,23 @@ const flaggedList = (flag: string, listArgs: readonly string[]): string[] => {
   return listArgs.length ? [flag, ...listArgs] : [];
 };
 
-const locateQtArchDir = (installDir: string): [string, boolean] => {
+const locateQtArchDir = (installDir: string, host: string): [string, boolean] => {
   // For 6.4.2/gcc, qmake is at 'installDir/6.4.2/gcc_64/bin/qmake'.
   // This makes a list of all the viable arch directories that contain a qmake file.
   const qtArchDirs = glob
     .sync(`${installDir}/[0-9]*/*/bin/qmake*`)
     .map((s) => path.resolve(s, "..", ".."));
 
-  // For Qt6 mobile and wasm installations, and Qt6 Windows on ARM installations,
+  // For Qt6 mobile and wasm installations, and Qt6 Windows on ARM cross-compiled installations,
   // a standard desktop Qt installation must exist alongside the requested architecture.
   // In these cases, we must select the first item that ends with 'android*', 'ios', 'wasm*' or 'msvc*_arm64'.
   const requiresParallelDesktop = qtArchDirs.filter((archPath) => {
     const archDir = path.basename(archPath);
     const versionDir = path.basename(path.join(archPath, ".."));
     return (
-      versionDir.match(/^6\.\d+\.\d+$/) && archDir.match(/^(android.*|ios|wasm.*|msvc.*_arm64)$/)
+      versionDir.match(/^6\.\d+\.\d+$/) &&
+      (archDir.match(/^(android.*|ios|wasm.*)$/) ||
+        (archDir.match(/^msvc.*_arm64$/) && host !== "windows_arm64"))
     );
   });
   if (requiresParallelDesktop.length) {
@@ -107,7 +109,7 @@ const isAutodesktopSupported = async (): Promise<boolean> => {
 };
 
 class Inputs {
-  readonly host: "windows" | "mac" | "linux" | "all_os";
+  readonly host: "windows" | "windows_arm64" | "mac" | "linux" | "linux_arm64" | "all_os";
   readonly target: "desktop" | "android" | "ios" | "wasm";
   readonly version: string;
   readonly arch: string;
@@ -149,24 +151,33 @@ class Inputs {
     if (!host) {
       switch (process.platform) {
         case "win32": {
-          this.host = "windows";
+          this.host = process.arch === "arm64" ? "windows_arm64" : "windows";
           break;
         }
         case "darwin": {
           this.host = "mac";
           break;
         }
         default: {
-          this.host = "linux";
+          this.host = process.arch === "arm64" ? "linux_arm64" : "linux";
           break;
         }
       }
     } else {
       // Make sure host is one of the allowed values
-      if (host === "windows" || host === "mac" || host === "linux" || host === "all_os") {
+      if (
+        host === "windows" ||
+        host === "windows_arm64" ||
+        host === "mac" ||
+        host === "linux" ||
+        host === "linux_arm64" ||
+        host === "all_os"
+      ) {
         this.host = host;
       } else {
-        throw TypeError(`host: "${host}" is not one of "windows" | "mac" | "linux" | "all_os"`);
+        throw TypeError(
+          `host: "${host}" is not one of "windows" | "windows_arm64" | "mac" | "linux" | "linux_arm64" | "all_os"`
+        );
       }
     }
 
@@ -205,6 +216,8 @@ class Inputs {
         } else {
           this.arch = "win64_msvc2017_64";
         }
+      } else if (this.host === "windows_arm64") {
+        this.arch = "win64_msvc2022_arm64";
       }
     }
 
@@ -482,7 +495,7 @@ const run = async (): Promise<void> => {
   }
   // Set environment variables/outputs for binaries
   if (inputs.isInstallQtBinaries) {
-    const [qtPath, requiresParallelDesktop] = locateQtArchDir(inputs.dir);
+    const [qtPath, requiresParallelDesktop] = locateQtArchDir(inputs.dir, inputs.host);
     // Set outputs
     core.setOutput("qtPath", qtPath);