merge

.github/workflows/test-android.yml

@@ -25,11 +25,11 @@ jobs:
             example-modules:  qtsensors
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           cache: npm
           cache-dependency-path: action/
 

.github/workflows/test.yml

@@ -6,11 +6,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           cache: npm
           cache-dependency-path: action/
 
@@ -33,8 +33,9 @@ jobs:
           - ubuntu-20.04
           - windows-2022
           - windows-2019
-          - macos-11
           - macos-12
+          - macos-13
+          - macos-14
         aqtversion:
           - null  # use whatever the default is
         src-doc-examples:
@@ -50,6 +51,9 @@ jobs:
             requested: "6.3.*"
             # In Qt 6.2.0+, qtwebengine requires qtpositioning and qtwebchannel
             modules: qtwebengine qtpositioning qtwebchannel
+          - version: "6.7.0"
+            requested: "6.7.0"
+            modules: qtwebengine qtpositioning qtwebchannel
           - tools-only-build: true
             add-tools-to-path: true
         cache:
@@ -89,11 +93,11 @@ jobs:
 
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           cache: npm
           cache-dependency-path: action/
 
@@ -125,6 +129,20 @@ jobs:
           tools: tools_ifw tools_qtcreator,qt.tools.qtcreator
           cache: ${{ matrix.cache == 'cached' }}
 
+      - name: Switch macOS Xcode version with older Qt versions
+        if: ${{ matrix.qt.version && (startsWith(matrix.os, 'macos-13') || startsWith(matrix.os, 'macos-14')) }}
+        shell: pwsh
+        env:
+          QT_VERSION: ${{ matrix.qt.version }}
+        run: |
+          if ([version]$env:QT_VERSION -ge [version]"6.5.3") {
+              # GitHub macOS 13/14 runners use Xcode 15.0.x by default which has a known linker issue causing crashes if the artifact is run on macOS <= 12
+              sudo xcode-select --switch /Applications/Xcode_15.2.app
+          } else {
+              # Keep older Qt versions on Xcode 14 due to concern over QTBUG-117484
+              sudo xcode-select --switch /Applications/Xcode_14.3.1.app
+          }
+
       - name: Configure test project on windows
         if: ${{ matrix.qt.version && startsWith(matrix.os, 'windows') }}
         env:

README.md

@@ -234,6 +234,12 @@ If you set either `no-qt-binaries` or `tools-only` to `true`, you will skip inst
 
 Default: `false`
 
+### `aqtsource`
+
+The full specifier for a version of [aqtinstall](https://github.com/miurahr/aqtinstall) as passed to pip. For example: `git+https://github.com/miurahr/aqtinstall.git`. This is intended to be used to troubleshoot any bugs that might be caused or fixed by certain versions of aqtinstall. Note that when this is used, the value of `aqtversion` is ignored.
+
+By default this is unset and ignored.
+
 ### `aqtversion`
 
 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.

action.yml

@@ -51,6 +51,8 @@ inputs:
   tools-only:
     description: Synonym for `no-qt-binaries`, used for backwards compatibility.
     default: false
+  aqtsource:
+    description: Location to source aqtinstall from in case of issues
   aqtversion:
     description: Version of aqtinstall to use in case of issues
     default: ==3.1.*
@@ -83,7 +85,7 @@ runs:
   steps:
   - name: Setup Python 
     if: ${{ inputs.setup-python  == 'true' }}
-    uses: actions/setup-python@v4
+    uses: actions/setup-python@v5
     with:
       python-version: '3.6.x - 3.11.x'
 
@@ -105,6 +107,7 @@ runs:
       set-env: ${{ inputs.set-env }}
       no-qt-binaries: ${{ inputs.no-qt-binaries }}
       tools-only: ${{ inputs.tools-only }}
+      aqtsource: ${{ inputs.aqtsource }}
       aqtversion: ${{ inputs.aqtversion }}
       py7zrversion: ${{ inputs.py7zrversion }}
       source: ${{ inputs.source }}

action/.eslintrc.js

@@ -57,7 +57,7 @@ module.exports = {
     "@typescript-eslint/no-floating-promises": "error",
     "@typescript-eslint/no-invalid-this": "error",
     "@typescript-eslint/no-loop-func": "error",
-    "@typescript-eslint/no-magic-numbers": ["error", { ignoreArrayIndexes: true }],
+    "@typescript-eslint/no-magic-numbers": ["error", { ignoreArrayIndexes: true, ignore: [0, 1] }],
     "@typescript-eslint/no-redeclare": "error",
     "@typescript-eslint/no-require-imports": "error",
     "@typescript-eslint/no-restricted-imports": "error",

action/action.yml

@@ -48,6 +48,8 @@ inputs:
   tools-only:
     description: Synonym for `no-qt-binaries`, used for backwards compatibility.
     default: false
+  aqtsource:
+    description: Location to source aqtinstall from in case of issues
   aqtversion:
     description: Version of aqtinstall to use in case of issues
     default: ==3.1.*
@@ -76,5 +78,5 @@ inputs:
   example-modules:
     description: Space-separated list of additional example modules to install.
 runs:
-  using: node16
+  using: node20
   main: lib/main.js

action/package.json

@@ -17,7 +17,7 @@
   "license": "MIT",
   "dependencies": {
     "@actions/cache": "^3.0.0",
-    "@actions/core": "^1.9.1",
+    "@actions/core": "^1.10.1",
     "@actions/exec": "^1.1.0",
     "compare-versions": "^3.6.0",
     "glob": "^7.0.0"

action/src/main.ts

@@ -108,6 +108,7 @@ class Inputs {
   readonly isInstallQtBinaries: boolean;
   readonly setEnv: boolean;
 
+  readonly aqtSource: string;
   readonly aqtVersion: string;
   readonly py7zrVersion: string;
 
@@ -210,6 +211,7 @@ class Inputs {
 
     this.setEnv = Inputs.getBoolInput("set-env");
 
+    this.aqtSource = core.getInput("aqtsource");
     this.aqtVersion = core.getInput("aqtversion");
 
     this.py7zrVersion = core.getInput("py7zrversion");
@@ -237,6 +239,7 @@ class Inputs {
         this.version,
         this.dir,
         this.py7zrVersion,
+        this.aqtSource,
         this.aqtVersion,
       ],
       this.modules,
@@ -308,9 +311,16 @@ const run = async (): Promise<void> => {
           "libxkbcommon-dev",
           "libxkbcommon-x11-0",
           "libxcb-xkb-dev",
-        ].join(" ");
+        ];
+
+        // Qt 6.5.0 adds this requirement:
+        // https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md
+        if (compareVersions(inputs.version, ">=", "6.5.0")) {
+          dependencies.push("libxcb-cursor0");
+        }
+
         const updateCommand = "apt-get update";
-        const installCommand = `apt-get install ${dependencies} -y`;
+        const installCommand = `apt-get install ${dependencies.join(" ")} -y`;
         if (inputs.installDeps === "nosudo") {
           await exec(updateCommand);
           await exec(installCommand);
@@ -344,7 +354,11 @@ const run = async (): Promise<void> => {
       await execPython("pip install", ["setuptools", "wheel", `"py7zr${inputs.py7zrVersion}"`]);
 
       // Install aqtinstall separately: allows aqtinstall to override py7zr if required
-      await execPython("pip install", [`"aqtinstall${inputs.aqtVersion}"`]);
+      if (inputs.aqtSource.length > 0) {
+        await execPython("pip install", [`"${inputs.aqtSource}"`]);
+      } else {
+        await execPython("pip install", [`"aqtinstall${inputs.aqtVersion}"`]);
+      }
 
       // This flag will install a parallel desktop version of Qt, only where required.
       // aqtinstall will automatically determine if this is necessary.
@@ -415,13 +429,18 @@ const run = async (): Promise<void> => {
       toolsPaths(inputs.dir).map(nativePath).forEach(core.addPath);
     }
 
-    // Set environment variables
-    if (inputs.setEnv) {
-      if (inputs.tools.length) {
-        core.exportVariable("IQTA_TOOLS", nativePath(`${inputs.dir}/Tools`));
-      }
-      if (inputs.isInstallQtBinaries) {
-        const qtPath = nativePath(locateQtArchDir(inputs.dir));
+    // Set environment variables/outputs for tools
+    if (inputs.tools.length && inputs.setEnv) {
+      core.exportVariable("IQTA_TOOLS", nativePath(`${inputs.dir}/Tools`));
+    }
+    // Set environment variables/outputs for binaries
+    if (inputs.isInstallQtBinaries) {
+      const qtPath = nativePath(locateQtArchDir(inputs.dir));
+      // Set outputs
+      core.setOutput("qtPath", qtPath);
+
+      // Set env variables
+      if (inputs.setEnv) {
         if (process.platform === "linux") {
           setOrAppendEnvVar("LD_LIBRARY_PATH", nativePath(`${qtPath}/lib`));
         }

tests/TestWithModules/TestWithModules.pro

@@ -4,6 +4,10 @@ QT += webenginewidgets
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
+# Xcode 15 fix
+# https://crystalidea.com/blog/qt-apps-crash-when-using-xcode-15
+LIBS += -Wl,-ld_classic
+
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the