Update to Qt 6.7.1 (#136)

* Update to Qt 6.7.1 * Update to Qt install action v4
maplibre · May 25, 2024 · 3a83b8e · 3a83b8e
1 parent 08baedf
commit 3a83b8e
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 53 deletions.
diff --git a/.github/actions/qt5-build/entrypoint.sh b/.github/actions/qt5-build/entrypoint.sh
@@ -6,7 +6,7 @@ set -e
 set -x
 
 export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
-export PATH="$Qt5_Dir/bin:$PATH"
+export PATH="$QT_ROOT_DIR/bin:$PATH"
 qmake --version
 
 # Main project

diff --git a/.github/actions/qt6-build/entrypoint.sh b/.github/actions/qt6-build/entrypoint.sh
@@ -4,7 +4,7 @@ set -e
 set -x
 
 export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
-export PATH="$Qt6_DIR/bin:$PATH"
+export PATH="$QT_ROOT_DIR/bin:$PATH"
 qmake --version
 
 # Main project

diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
@@ -68,16 +68,16 @@ jobs:
           - qt_version: 6.6.3
             abi: arm64-v8a
             arch: android_arm64_v8a
-          # - qt_version: 6.7.0
+          # - qt_version: 6.7.1
           #   abi: x86
           #   arch: android_x86
-          # - qt_version: 6.7.0
+          # - qt_version: 6.7.1
           #   abi: x86_64
           #   arch: android_x86_64
-          # - qt_version: 6.7.0
+          # - qt_version: 6.7.1
           #   abi: armeabi-v7a
           #   arch: android_armv7
-          # - qt_version: 6.7.0
+          # - qt_version: 6.7.1
           #   abi: arm64-v8a
           #   arch: android_arm64_v8a
 
@@ -89,18 +89,9 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: Download Qt (desktop)
-        id: qt-desktop
-        uses: jurplel/install-qt-action@v3
-        with:
-          aqtversion: ==3.1.*
-          version: ${{ matrix.qt_version }}
-          modules: qtlocation qtpositioning
-          set-env: false
-
-      - name: Download Qt (Android)
+      - name: Download Qt
         id: qt-android
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: ==3.1.*
           version: ${{ matrix.qt_version }}
@@ -111,8 +102,8 @@ jobs:
       - name: Fix Qt release
         if: ${{ matrix.abi }} == 'armeabi-v7a'
         run: |
-          chmod +x "$Qt6_DIR/bin/qt-cmake"
-          sed -i "s/C:\/Qt\/Qt-${QT_VERSION}/\/usr\/local\/Qt-${QT_VERSION}/g" "$Qt6_DIR/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake"
+          chmod +x "$QT_ROOT_DIR/bin/qt-cmake"
+          sed -i "s/C:\/Qt\/Qt-${QT_VERSION}/\/usr\/local\/Qt-${QT_VERSION}/g" "$QT_ROOT_DIR/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake"
 
       - name: Set up OpenJDK 17
         uses: actions/setup-java@v4
@@ -134,7 +125,7 @@ jobs:
           ANDROID_ABI: ${{ matrix.abi }}
         working-directory: source
         run: |
-          export QT_HOST_PATH="$(readlink -f "$Qt6_DIR/../gcc_64")"
+          export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../gcc_64")"
           cmake --workflow --preset Android-ccache
 
       - name: Upload artifacts

diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -58,12 +58,12 @@ jobs:
             preset: Linux-CI
             compiler: default
           - qt_series: 6
-            qt_version: 6.7.0
+            qt_version: 6.7.1
             qt_modules: qtlocation qtpositioning
             preset: Linux-CI
             compiler: default
           - qt_series: 6
-            qt_version: 6.7.0
+            qt_version: 6.7.1
             qt_modules: qtlocation qtpositioning
             preset: Linux-coverage
             compiler: gcc-13
@@ -128,7 +128,7 @@ jobs:
           rm -rf lcov
 
       - name: Download Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: ==3.1.*
           version: ${{ matrix.qt_version }}
@@ -223,7 +223,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.0]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.1]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -72,7 +72,7 @@ jobs:
             compiler_version: 14.29
             preset: Windows-ccache
           - qt_series: 6
-            qt_version: 6.7.0
+            qt_version: 6.7.1
             qt_arch: win64_msvc2019_64
             qt_modules: qtlocation qtpositioning
             arch: msvc2019_64
@@ -99,7 +99,7 @@ jobs:
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 || true
 
       - name: Download Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: ==3.1.*
           version: ${{ matrix.qt_version }}
@@ -180,7 +180,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.0]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.1]
         arch: [msvc2019_64]
 
     steps:

diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml
@@ -48,7 +48,7 @@ jobs:
             preset: iOS-ccache
           - qt_version: 6.6.3
             preset: iOS-ccache
-          - qt_version: 6.7.0
+          - qt_version: 6.7.1
             preset: iOS-ccache
 
     env:
@@ -67,17 +67,8 @@ jobs:
         with:
           xcode-version: latest-stable
 
-      - name: Download Qt (desktop)
-        uses: jurplel/install-qt-action@v3
-        with:
-          aqtversion: ==3.1.*
-          version: ${{ matrix.qt_version }}
-          target: desktop
-          modules: qtlocation qtpositioning
-          set-env: false
-
-      - name: Download Qt (iOS)
-        uses: jurplel/install-qt-action@v3
+      - name: Download Qt
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: ==3.1.*
           version: ${{ matrix.qt_version }}
@@ -96,7 +87,7 @@ jobs:
       - name: Build
         working-directory: source
         run: |
-          export QT_HOST_PATH="$(readlink -f "$Qt6_DIR/../macos")"
+          export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../macos")"
           cmake --workflow --preset ${PRESET}
 
       - name: Upload installation
@@ -114,7 +105,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.3, 6.7.0]
+        qt_version: [6.5.3, 6.6.3, 6.7.1]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -63,13 +63,13 @@ jobs:
             compiler: default
             runs_on: macos-14
           - qt_series: 6
-            qt_version: 6.7.0
+            qt_version: 6.7.1
             qt_modules: qtlocation qtpositioning
             preset: macOS-ccache
             compiler: default
             runs_on: macos-14
           - qt_series: 6
-            qt_version: 6.7.0
+            qt_version: 6.7.1
             qt_modules: qtlocation qtpositioning
             preset: macOS-clang-tidy
             compiler: llvm
@@ -105,7 +105,7 @@ jobs:
           } >> "$GITHUB_ENV"
 
       - name: Download Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           aqtversion: ==3.1.*
           version: ${{ matrix.qt_version }}
@@ -169,7 +169,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.0]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.1]
 
     steps:
       - name: Download artifacts

diff --git a/cmake/presets/Android.json b/cmake/presets/Android.json
@@ -7,7 +7,7 @@
       "displayName": "Android configuration using Qt6",
       "generator": "Ninja",
       "binaryDir": "${sourceParentDir}/build/qt6-Android",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "ANDROID_ABI": "$penv{ANDROID_ABI}"

diff --git a/cmake/presets/Linux.json b/cmake/presets/Linux.json
@@ -7,7 +7,7 @@
       "displayName": "Linux configuration using Qt6",
       "generator": "Ninja",
       "binaryDir": "${sourceParentDir}/build/qt6-Linux",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "QT_VERSION_MAJOR": "6"

diff --git a/cmake/presets/WASM.json b/cmake/presets/WASM.json
@@ -7,7 +7,7 @@
       "displayName": "WASM configuration using Qt6",
       "generator": "Ninja",
       "binaryDir": "${sourceParentDir}/build/qt6-WASM",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "MLN_QT_WITH_LOCATION": "OFF"

diff --git a/cmake/presets/Windows.json b/cmake/presets/Windows.json
@@ -7,7 +7,7 @@
       "displayName": "Windows configuration using Qt6",
       "generator": "Ninja Multi-Config",
       "binaryDir": "${sourceParentDir}/build/qt6-Windows",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_CONFIGURATION_TYPES": "Release;Debug"
       }

diff --git a/cmake/presets/iOS.json b/cmake/presets/iOS.json
@@ -7,7 +7,7 @@
       "displayName": "iOS configuration using Qt6",
       "generator": "Ninja Multi-Config",
       "binaryDir": "${sourceParentDir}/build/qt6-iOS",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_CONFIGURATION_TYPES": "Release;Debug",
         "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64",

diff --git a/cmake/presets/macOS.json b/cmake/presets/macOS.json
@@ -7,7 +7,7 @@
       "displayName": "macOS configuration using Qt6",
       "generator": "Ninja",
       "binaryDir": "${sourceParentDir}/build/qt6-macOS",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "CMAKE_OSX_ARCHITECTURES": "x86_64;arm64",

diff --git a/examples/quick/CMakePresets.json b/examples/quick/CMakePresets.json
@@ -11,7 +11,7 @@
       "displayName": "MapLibre Qt Quick example configuration",
       "generator": "Ninja",
       "binaryDir": "${sourceParentDir}/../../build/qt6-example-quick",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_C_COMPILER_LAUNCHER": "ccache",

diff --git a/examples/widgets/CMakePresets.json b/examples/widgets/CMakePresets.json
@@ -11,7 +11,7 @@
       "displayName": "MapLibre Qt Widgets example configuration",
       "generator": "Ninja",
       "binaryDir": "${sourceParentDir}/../../build/qt6-example-widgets",
-      "toolchainFile": "$penv{Qt6_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile": "$penv{QT_ROOT_DIR}/lib/cmake/Qt6/qt.toolchain.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_C_COMPILER_LAUNCHER": "ccache",