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

Update Qt to 6.9.2

Browse source
This commit is contained in:
Dan Paulat 2025-08-26 23:26:28 -05:00
parent 5b031b7095
commit fa71e1fc85
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: '' ldflags: ''
msvc_arch: x64 msvc_arch: x64
msvc_version: 2022 msvc_version: 2022
qt_version: 6.8.3 qt_version: 6.9.2
qt_arch_aqt: win64_msvc2022_64 qt_arch_aqt: win64_msvc2022_64
qt_arch_dir: msvc2022_64 qt_arch_dir: msvc2022_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -47,7 +47,7 @@ jobs:
compiler: gcc compiler: gcc
cppflags: '' cppflags: ''
ldflags: '' ldflags: ''
qt_version: 6.8.3 qt_version: 6.9.2
qt_arch_aqt: linux_gcc_64 qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64 qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -65,7 +65,7 @@ jobs:
compiler: clang compiler: clang
cppflags: '' cppflags: ''
ldflags: '' ldflags: ''
qt_version: 6.8.3 qt_version: 6.9.2
qt_arch_aqt: linux_gcc_64 qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64 qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -83,7 +83,7 @@ jobs:
compiler: gcc compiler: gcc
cppflags: '' cppflags: ''
ldflags: '' ldflags: ''
qt_version: 6.8.3 qt_version: 6.9.2
qt_arch_aqt: linux_gcc_arm64 qt_arch_aqt: linux_gcc_arm64
qt_arch_dir: gcc_arm64 qt_arch_dir: gcc_arm64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -99,7 +99,7 @@ jobs:
env_cc: clang env_cc: clang
env_cxx: clang++ env_cxx: clang++
compiler: clang compiler: clang
qt_version: 6.8.3 qt_version: 6.9.2
qt_arch_aqt: clang_64 qt_arch_aqt: clang_64
qt_arch_dir: macos qt_arch_dir: macos
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -114,7 +114,7 @@ jobs:
env_cc: clang env_cc: clang
env_cxx: clang++ env_cxx: clang++
compiler: clang compiler: clang
qt_version: 6.8.3 qt_version: 6.9.2
qt_arch_aqt: clang_64 qt_arch_aqt: clang_64
qt_arch_dir: macos qt_arch_dir: macos
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport

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

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

10
CMakePresets.json
View file

@ -54,7 +54,7 @@
"inherits": "windows-x64-base", "inherits": "windows-x64-base",
"hidden": true, "hidden": true,
"cacheVariables": { "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, "hidden": true,
"generator": "Ninja", "generator": "Ninja",
"cacheVariables": { "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", "inherits": "linux-base",
"hidden": true, "hidden": true,
"cacheVariables": { "cacheVariables": {
"CMAKE_PREFIX_PATH": "/opt/Qt/6.8.3/gcc_64" "CMAKE_PREFIX_PATH": "/opt/Qt/6.9.2/gcc_64"
}, },
"environment": { "environment": {
"CC": "gcc-11", "CC": "gcc-11",
@ -212,7 +212,7 @@
"displayName": "CI Linux GCC ARM64", "displayName": "CI Linux GCC ARM64",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Release", "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_HOST_PROFILE": "scwx-linux_gcc-11_armv8",
"CONAN_BUILD_PROFILE": "scwx-linux_gcc-11_armv8" "CONAN_BUILD_PROFILE": "scwx-linux_gcc-11_armv8"
}, },
@ -226,7 +226,7 @@
"inherits": "base", "inherits": "base",
"hidden": true, "hidden": true,
"cacheVariables": { "cacheVariables": {
"CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.8.3/macos" "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.9.2/macos"
}, },
"condition": { "condition": {
"type": "equals", "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 #!/bin/bash
export qt_version=6.8.3 export qt_version=6.9.2