From 7bc5021989138effb750c6a0c1585c3051bcc7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 8 Oct 2022 15:38:36 +0200 Subject: [PATCH] Switched CI builds to Qt 6.4 --- .appveyor.yml | 2 +- .github/workflows/android.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7c122ebc..734ca7cd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,7 +11,7 @@ environment: OPENSSLDIR: C:\OpenSSL-v111-Win64\bin matrix: - QTDIR: C:\Qt\5.15\msvc2019_64 - - QTDIR: C:\Qt\6.3\msvc2019_64 + - QTDIR: C:\Qt\6.4\msvc2019_64 NSISDEF: /DQT6 install: diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 165b9fba..3b065dcc 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -22,19 +22,19 @@ jobs: - name: Run sdkmanager update run: ${ANDROID_HOME}/tools/bin/sdkmanager --update - name: Install android platform, platform-tools, build-tools and ndk - run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670" + run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;23.1.7779620" - name: Setup NDK path - run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV + run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV - name: Install Qt (Desktop) uses: jurplel/install-qt-action@v2 with: aqtversion: '==2.1.0' - version: '6.3.1' + version: '6.4.0' - name: Install Qt (Android) uses: jurplel/install-qt-action@v2 with: aqtversion: '==2.1.0' - version: '6.3.1' + version: '6.4.0' target: 'android' arch: 'android_armv7' modules: qtpositioning qt5compat