Skip to content

Commit 076d0a6

Browse files
committed
qt 683
1 parent 9d0ce0a commit 076d0a6

11 files changed

Lines changed: 24 additions & 24 deletions

File tree

.github/workflows/android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
2424
runs-on: macos-15
2525
env:
26-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
26+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
2727
NDK_VERSION: 'r26' # '26.1.10909125'
2828
NDK_VERSION_FULL: r26b
2929
JDK_VERSION: 17
3030
SDK_PLATFORM: android-34
3131
SDK_BUILD_TOOLS: 34.0.0
32-
INPUT_SDK_VERSION_ARM: arm-android-20250307-238
33-
INPUT_SDK_VERSION_ARM64: arm64-android-20250307-238
32+
INPUT_SDK_VERSION_ARM: arm-android-20250326-241
33+
INPUT_SDK_VERSION_ARM64: arm64-android-20250326-241
3434
CCACHE_DIR: /Users/runner/work/ccache
3535
GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
3636
CACHE_VERSION: 0

.github/workflows/code_style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- published
1919

2020
env:
21-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
21+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
2222
CACHE_VERSION: 0
2323

2424
jobs:

.github/workflows/gallery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
os: [ubuntu-latest, macos-15, windows-2022]
2525
runs-on: ${{ matrix.os }}
2626
env:
27-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
27+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
2828
GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
2929
CACHE_VERSION: 0
3030
XC_VERSION: ${{ '16.2' }} # macos-only

.github/workflows/i18n.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: ( github.repository == 'MerginMaps/mobile' ) && (!contains(github.event.head_commit.message, 'Translate '))
1212
runs-on: ubuntu-latest
1313
env:
14-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
14+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
1515
steps:
1616

1717
- uses: actions/checkout@v4

.github/workflows/ios.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ on:
1616
- published
1717

1818
env:
19-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
19+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
2020
XC_VERSION: ${{ '16.2' }}
2121
IOS_CMAKE_TOOLCHAIN_VERSION: "4.4.0"
22-
INPUT_SDK_VERSION: arm64-ios-20250307-195
22+
INPUT_SDK_VERSION: arm64-ios-20250326-198
2323
IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
2424
KEYCHAIN: ${{ 'inputapp.keychain' }}
2525
CCACHE_DIR: /Users/runner/work/ccache

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ on:
1717

1818
env:
1919
CCACHE_DIR: ~/.ccache
20-
INPUT_SDK_VERSION: x64-linux-20250308-194
21-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
20+
INPUT_SDK_VERSION: x64-linux-20250327-197
21+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
2222
CMAKE_VERSION: '3.29.0'
2323
CACHE_VERSION: 0
2424

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ on:
1616
- published
1717

1818
env:
19-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
20-
INPUT_SDK_VERSION: x64-osx-20250307-215
19+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
20+
INPUT_SDK_VERSION: x64-osx-20250326-218
2121
CCACHE_DIR: /Users/runner/work/ccache
2222
CACHE_VERSION: 0
2323
CMAKE_VERSION: '3.29.0'

.github/workflows/macos_arm64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ on:
1616
- published
1717

1818
env:
19-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
20-
INPUT_SDK_VERSION: arm64-osx-20250307-14
19+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
20+
INPUT_SDK_VERSION: arm64-osx-20250326-17
2121
CCACHE_DIR: /Users/runner/work/ccache
2222
CACHE_VERSION: 0
2323
CMAKE_VERSION: '3.29.0'

.github/workflows/win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
runs-on: windows-2022
2626

2727
env:
28-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
29-
INPUT_SDK_VERSION: x64-windows-20250308-245
28+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
29+
INPUT_SDK_VERSION: x64-windows-20250327-248
3030
CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
3131
CACHE_VERSION: 0
3232
VS_VERSION: "2022"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.22)
88
set(MM_VERSION_MAJOR "2025")
99
set(MM_VERSION_MINOR "2")
1010
set(MM_VERSION_PATCH "0")
11-
set(QT_VERSION_DEFAULT "6.8.2")
11+
set(QT_VERSION_DEFAULT "6.8.3")
1212

1313
# Note: we cannot set this for non-android build, since CMake will start looking for
1414
# Qt6AndroidMacros.cmake

0 commit comments

Comments
 (0)