Update Qt to 6.5.2

opengisch · Jul 19, 2023 · 71bde21 · 71bde21
1 parent a12075c
commit 71bde21
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -70,7 +70,7 @@ jobs:
       - name: 💐 Install Qt (Android)
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.5.1
+          version: 6.5.2
           modules: 'qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtmultimedia qtwebview qtsensors'
           target: android
           arch: ${{ matrix.qt_arch }}
@@ -79,7 +79,7 @@ jobs:
       - name: 💐 Install Qt (Desktop)
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.5.1
+          version: 6.5.2
           modules: 'qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtmultimedia qtwebview qtsensors'
           target: desktop
           cache: false
@@ -129,8 +129,8 @@ jobs:
                 -D WITH_ALL_FILES_ACCESS="${{ matrix.all_files_access }}" \
                 -D WITH_SPIX=OFF \
                 -D CMAKE_PREFIX_PATH=${Qt6_DIR} \
-                -D QT_HOST_PATH=/home/runner/work/QField/Qt/6.5.1/gcc_64 \
-                -D QT_HOST_PATH_CMAKE_DIR:PATH=/home/runner/work/QField/Qt/6.5.1/gcc_64 \
+                -D QT_HOST_PATH=/home/runner/work/QField/Qt/6.5.2/gcc_64 \
+                -D QT_HOST_PATH_CMAKE_DIR:PATH=/home/runner/work/QField/Qt/6.5.2/gcc_64 \
                 -D APP_VERSION="${APP_VERSION}" \
                 -D APK_VERSION_CODE="${APK_VERSION_CODE}" \
                 -D APP_VERSION_STR="${APP_VERSION_STR}" \

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -28,15 +28,15 @@ jobs:
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.5.1
+          version: 6.5.2
           modules: 'qt5compat qtcharts qtpositioning qtconnectivity qtmultimedia qtwebview qtsensors'
           target: ios
           cache: false
 
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.5.1
+          version: 6.5.2
           target: desktop
           cache: false
 
@@ -110,8 +110,8 @@ jobs:
                 -D CMAKE_SYSTEM_NAME=iOS \
                 -D CMAKE_SYSTEM_PROCESSOR=aarch64 \
                 -D CMAKE_OSX_DEPLOYMENT_TARGET=${{ env.DEPLOYMENT_TARGET }} \
-                -D QT_HOST_PATH=${{ github.workspace }}/../Qt/6.5.1/macos \
-                -D QT_HOST_PATH_CMAKE_DIR:PATH=${{ github.workspace }}/../Qt/6.5.1/macos \
+                -D QT_HOST_PATH=${{ github.workspace }}/../Qt/6.5.2/macos \
+                -D QT_HOST_PATH_CMAKE_DIR:PATH=${{ github.workspace }}/../Qt/6.5.2/macos \
                 -D ENABLE_TESTS=OFF \
                 -D CMAKE_CXX_VISIBILITY_PRESET=hidden \
                 -D WITH_CCACHE=ON

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -44,7 +44,7 @@ jobs:
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.5.1
+          version: 6.5.2
           modules: 'qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtmultimedia qtwebview qtsensors'
           target: desktop
 

diff --git a/scripts/build-for-linux.sh b/scripts/build-for-linux.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 QT_PREFIX=${HOME}/.qt
-QT_VERSION=6.5.1
+QT_VERSION=6.5.2
 
 # pip install aqtinstall
 # aqt install-qt linux desktop ${QT_VERSION} gcc_64 -O ${QT_PREFIX} -m qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtmultimedia qtwebview qtsensors # Modules come from .github/workflows/android.yaml

diff --git a/scripts/build-vcpkg.sh b/scripts/build-vcpkg.sh
@@ -6,7 +6,7 @@ export SOURCE_DIR=/usr/src/qfield
 
 CMAKE_BUILD_DIR=/usr/src/qfield/build-${triplet}
 
-export Qt6_DIR=/home/devel/6.5.1/android_arm64_v8a
+export Qt6_DIR=/home/devel/6.5.2/android_arm64_v8a
 
 [[ -z ${APP_NAME} ]] && APP_NAME="QField"
 [[ -z ${APP_PACKAGE_NAME} ]] && APP_PACKAGE_NAME="qfield"
@@ -20,8 +20,8 @@ cmake -S "${SOURCE_DIR}" \
       -G Ninja \
       -D BUILD_WITH_QT6=ON \
       -D CMAKE_PREFIX_PATH=${Qt6_DIR} \
-      -D QT_HOST_PATH=/home/devel/6.5.1/gcc_64 \
-      -D QT_HOST_PATH_CMAKE_DIR=/home/devel/6.5.1/gcc_64/lib/cmake \
+      -D QT_HOST_PATH=/home/devel/6.5.2/gcc_64 \
+      -D QT_HOST_PATH_CMAKE_DIR=/home/devel/6.5.2/gcc_64/lib/cmake \
       -D VCPKG_TARGET_TRIPLET="${triplet}" \
       -D SYSTEM_QT=ON \
       -D ANDROID_NDK_VERSION="${ANDROID_NDK_VERSION}" \