From 9ad61556a8255d2a2890f8d845d724d32999bd7e Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Tue, 25 Jul 2023 14:10:17 +0200 Subject: [PATCH] qt652 --- .github/workflows/android.yml | 4 ++-- .github/workflows/i18n.yml | 2 +- .github/workflows/ios.yml | 4 ++-- .github/workflows/linux.yml | 4 ++-- .github/workflows/macos.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- .github/workflows/win.yml | 2 +- CMakeLists.txt | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2738b5a75..bd3fd0819 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -23,13 +23,13 @@ jobs: if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate ')) runs-on: macos-12 env: - QT_VERSION: '6.5.1' + QT_VERSION: '6.5.2' NDK_VERSION: r25 NDK_VERSION_FULL: r25b JDK_VERSION: 11 SDK_PLATFORM: android-31 SDK_BUILD_TOOLS: 33.0.1 - INPUT_SDK_VERSION: android-macOS-20230601-154 + INPUT_SDK_VERSION: android-macOS-20230725-157 CCACHE_DIR: /Users/runner/work/ccache GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }} CACHE_VERSION: 0 diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index 053f23bf9..98035c34f 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -11,7 +11,7 @@ jobs: if: ( github.repository == 'MerginMaps/input' ) && (!contains(github.event.head_commit.message, 'Translate ')) runs-on: ubuntu-latest env: - QT_VERSION: '6.5.1' + QT_VERSION: '6.5.2' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 693a2d877..12c13c62c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -16,9 +16,9 @@ on: - published env: - QT_VERSION: '6.5.1' + QT_VERSION: '6.5.2' XC_VERSION: ${{ '14.2' }} - INPUT_SDK_VERSION: ios-20230531-107 + INPUT_SDK_VERSION: ios-20230725-113 IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610 KEYCHAIN: ${{ 'inputapp.keychain' }} CCACHE_DIR: /Users/runner/work/ccache diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5f0260e91..17e740c4a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,8 +16,8 @@ on: env: CCACHE_DIR: ~/.ccache - INPUT_SDK_VERSION: ubuntu-2204-20230531-118 - QT_VERSION: '6.5.1' + INPUT_SDK_VERSION: ubuntu-2204-20230725-123 + QT_VERSION: '6.5.2' CACHE_VERSION: 0 concurrency: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 72195c1ee..48de2da53 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,8 +15,8 @@ on: - published env: - QT_VERSION: 6.5.1 - INPUT_SDK_VERSION: mac-20230530-132 + QT_VERSION: '6.5.2' + INPUT_SDK_VERSION: mac-20230725-138 CCACHE_DIR: /Users/runner/work/ccache CACHE_VERSION: 0 XC_VERSION: ${{ '14.2' }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f77bd551a..2939653f6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,8 +17,8 @@ on: env: TEST_MERGIN_URL: https://test.dev.merginmaps.com/ - QT_VERSION: 6.5.1 - INPUT_SDK_VERSION: mac-20230530-132 + QT_VERSION: '6.5.2' + INPUT_SDK_VERSION: mac-20230725-138 CCACHE_DIR: /Users/runner/work/ccache CACHE_VERSION: 0 XC_VERSION: ${{ '14.2' }} diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index c21e8a86c..71e3c444d 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -25,7 +25,7 @@ jobs: runs-on: windows-2019 env: - QT_VERSION: '6.5.1' + QT_VERSION: '6.5.2' INPUT_SDK_VERSION: win64-20230531-151 CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache CACHE_VERSION: 0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e96fe0ca..18557a0a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.22) set(MM_VERSION_MAJOR "2") set(MM_VERSION_MINOR "3") set(MM_VERSION_PATCH "0") -set(QT_VERSION_DEFAULT "6.5.1") +set(QT_VERSION_DEFAULT "6.5.2") # Note: we cannot set this for non-android build, since CMake will start looking for # Qt6AndroidMacros.cmake