blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-29 23:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #499 from dpaulat/feature/qt-6.9.2

Browse source 
Update Qt to 6.9.2
This commit is contained in:
Dan Paulat 2025-08-27 20:35:54 -05:00 • committed by GitHub
commit 26e7220959
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
ldflags: ''
msvc_arch: x64
msvc_version: 2022
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: win64_msvc2022_64
qt_arch_dir: msvc2022_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -47,7 +47,7 @@ jobs:
compiler: gcc
cppflags: ''
ldflags: ''
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -65,7 +65,7 @@ jobs:
compiler: clang
cppflags: ''
ldflags: ''
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -83,7 +83,7 @@ jobs:
compiler: gcc
cppflags: ''
ldflags: ''
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: linux_gcc_arm64
qt_arch_dir: gcc_arm64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -99,7 +99,7 @@ jobs:
env_cc: clang
env_cxx: clang++
compiler: clang
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: clang_64
qt_arch_dir: macos
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -114,7 +114,7 @@ jobs:
env_cc: clang
env_cxx: clang++
compiler: clang
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: clang_64
qt_arch_dir: macos
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport

2
.github/workflows/clang-tidy-review.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
build_type: Release
env_cc: clang-18
env_cxx: clang++-18
qt_version: 6.8.3
qt_version: 6.9.2
qt_arch_aqt: linux_gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: ''

10
CMakePresets.json
View file

@ -54,7 +54,7 @@
"inherits": "windows-x64-base",
"hidden": true,
"cacheVariables": {
"CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/msvc2022_64"
"CMAKE_PREFIX_PATH": "C:/Qt/6.9.2/msvc2022_64"
}
},
{
@ -63,7 +63,7 @@
"hidden": true,
"generator": "Ninja",
"cacheVariables": {
"CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/msvc2022_64"
"CMAKE_PREFIX_PATH": "C:/Qt/6.9.2/msvc2022_64"
}
},
{
@ -71,7 +71,7 @@
"inherits": "linux-base",
"hidden": true,
"cacheVariables": {
"CMAKE_PREFIX_PATH": "/opt/Qt/6.8.3/gcc_64"
"CMAKE_PREFIX_PATH": "/opt/Qt/6.9.2/gcc_64"
},
"environment": {
"CC": "gcc-11",
@ -212,7 +212,7 @@
"displayName": "CI Linux GCC ARM64",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_PREFIX_PATH": "/opt/Qt/6.8.3/gcc_arm64",
"CMAKE_PREFIX_PATH": "/opt/Qt/6.9.2/gcc_arm64",
"CONAN_HOST_PROFILE": "scwx-linux_gcc-11_armv8",
"CONAN_BUILD_PROFILE": "scwx-linux_gcc-11_armv8"
},
@ -226,7 +226,7 @@
"inherits": "base",
"hidden": true,
"cacheVariables": {
"CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.8.3/macos"
"CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.9.2/macos"
},
"condition": {
"type": "equals",

2
tools/lib/common-paths.bat
View file

@ -1 +1 @@
@set qt_version=6.8.3
@set qt_version=6.9.2

2
tools/lib/common-paths.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
export qt_version=6.8.3
export qt_version=6.9.2