Update to Qt 6.8.1

maplibre · Jan 11, 2025 · e731ce3 · e731ce3
1 parent d929c78
commit e731ce3
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 18 deletions.
diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
@@ -82,6 +82,18 @@ jobs:
           - qt_version: 6.7.3
             abi: arm64-v8a
             arch: android_arm64_v8a
+          - qt_version: 6.8.1
+            abi: x86
+            arch: android_x86
+          - qt_version: 6.8.1
+            abi: x86_64
+            arch: android_x86_64
+          - qt_version: 6.8.1
+            abi: armeabi-v7a
+            arch: android_armv7
+          - qt_version: 6.8.1
+            abi: arm64-v8a
+            arch: android_arm64_v8a
 
     steps:
       - name: Checkout
@@ -142,7 +154,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.3, 6.7.3]
+        qt_version: [6.5.3, 6.6.3, 6.7.3, 6.8.1]
 
     steps:
       - name: Download artifacts for x86
@@ -215,7 +227,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.3, 6.7.3]
+        qt_version: [6.5.3, 6.6.3, 6.7.3, 6.8.1]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -65,7 +65,12 @@ jobs:
             preset: Linux-CI
             compiler: default
           - qt_series: 6
-            qt_version: 6.7.3
+            qt_version: 6.8.1
+            qt_modules: qtlocation qtpositioning
+            preset: Linux-CI
+            compiler: default
+          - qt_series: 6
+            qt_version: 6.8.1
             qt_modules: qtlocation qtpositioning
             preset: Linux-coverage
             compiler: gcc-13
@@ -225,7 +230,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.3]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.3, 6.8.1]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -55,31 +55,34 @@ jobs:
             qt_modules: ""
             arch: msvc2019_64
             compiler: x64
-            compiler_version: 14.29
             preset: Windows-legacy-ccache
           - qt_series: 6
             qt_version: 6.5.3
             qt_arch: win64_msvc2019_64
             qt_modules: qtlocation qtpositioning
             arch: msvc2019_64
             compiler: x64
-            compiler_version: 14.29
             preset: Windows-ccache
           - qt_series: 6
             qt_version: 6.6.3
             qt_arch: win64_msvc2019_64
             qt_modules: qtlocation qtpositioning
             arch: msvc2019_64
             compiler: x64
-            compiler_version: 14.29
             preset: Windows-ccache
           - qt_series: 6
             qt_version: 6.7.3
             qt_arch: win64_msvc2019_64
             qt_modules: qtlocation qtpositioning
             arch: msvc2019_64
             compiler: x64
-            compiler_version: 14.29
+            preset: Windows-ccache
+          - qt_series: 6
+            qt_version: 6.8.1
+            qt_arch: win64_msvc2022_64
+            qt_modules: qtlocation qtpositioning
+            arch: msvc2022_64
+            compiler: x64
             preset: Windows-ccache
 
     env:
@@ -117,7 +120,6 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: ${{ matrix.compiler }}
-          toolset: ${{ matrix.compiler_version }}
 
       - name: Update ccache
         run: |
@@ -182,8 +184,17 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.3]
-        arch: [msvc2019_64]
+        include:
+          - qt_version: 5.15.2
+            arch: msvc2019_64
+          - qt_version: 6.5.3
+            arch: msvc2019_64
+          - qt_version: 6.6.3
+            arch: msvc2019_64
+          - qt_version: 6.7.3
+            arch: msvc2019_64
+          - qt_version: 6.8.1
+            arch: msvc2022_64
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml
@@ -52,6 +52,8 @@ jobs:
             preset: iOS
           - qt_version: 6.7.3
             preset: iOS
+          - qt_version: 6.8.1
+            preset: iOS
 
     env:
       PRESET: ${{ matrix.preset }}
@@ -71,10 +73,7 @@ jobs:
           brew uninstall google-chrome
           sudo rm -rf /Users/runner/Library/Android
           sudo rm -rf /Applications/Xcode_14*
-          sudo rm -rf /Applications/Xcode_15.0*
-          sudo rm -rf /Applications/Xcode_15.1*
-          sudo rm -rf /Applications/Xcode_15.2*
-          sudo rm -rf /Applications/Xcode_15.3*
+          sudo rm -rf /Applications/Xcode_15*
           ls /Applications
           df -h
 
@@ -115,7 +114,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.3, 6.7.3]
+        qt_version: [6.5.3, 6.6.3, 6.7.3, 6.8.1]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -76,7 +76,7 @@ jobs:
             compiler: static
             runs_on: macos-14
           - qt_series: 6
-            qt_version: 6.7.3
+            qt_version: 6.8.1
             qt_modules: qtlocation qtpositioning
             preset: macOS-clang-tidy
             compiler: llvm

diff --git a/.github/workflows/source-tarball.yml b/.github/workflows/source-tarball.yml
@@ -58,7 +58,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           aqtversion: ==3.1.*
-          version: 6.7.3
+          version: 6.8.1
           dir: ${{ github.workspace }}
           target: desktop
           modules: qtlocation qtpositioning