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

Merge pull request #261 from AdenKoperczak/qt6.7.2_bump

Browse source 
Qt6.7.2 bump
This commit is contained in:
Dan Paulat 2024-08-16 16:49:52 -05:00 • committed by GitHub
commit 6ef5553028
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ jobs:
compiler: msvc compiler: msvc
msvc_arch: x64 msvc_arch: x64
msvc_version: 2022 msvc_version: 2022
qt_version: 6.7.1 qt_version: 6.7.2
qt_arch_aqt: win64_msvc2019_64 qt_arch_aqt: win64_msvc2019_64
qt_arch_dir: msvc2019_64 qt_arch_dir: msvc2019_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
@ -45,7 +45,7 @@ jobs:
env_cc: gcc-11 env_cc: gcc-11
env_cxx: g++-11 env_cxx: g++-11
compiler: gcc compiler: gcc
qt_version: 6.7.1 qt_version: 6.7.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

1
scwx-qt/scwx-qt.cmake
View file

@ -43,6 +43,7 @@ find_package(Qt${QT_VERSION_MAJOR}
SerialPort SerialPort
Svg Svg
Widgets Widgets
Sql
REQUIRED) REQUIRED)
set(SRC_EXE_MAIN source/scwx/qt/main/main.cpp) set(SRC_EXE_MAIN source/scwx/qt/main/main.cpp)

2
setup-debug.bat
View file

@ -2,7 +2,7 @@ call tools\setup-common.bat
set build_dir=build-debug set build_dir=build-debug
set build_type=Debug set build_type=Debug
set qt_version=6.7.1 set qt_version=6.7.2
mkdir %build_dir% mkdir %build_dir%
cmake -B %build_dir% -S . ^ cmake -B %build_dir% -S . ^

2
setup-debug.sh
View file

@ -3,7 +3,7 @@
build_dir=${1:-build-debug} build_dir=${1:-build-debug}
build_type=Debug build_type=Debug
qt_version=6.7.1 qt_version=6.7.2
script_dir="$(dirname "$(readlink -f "$0")")" script_dir="$(dirname "$(readlink -f "$0")")"
mkdir -p ${build_dir} mkdir -p ${build_dir}

2
setup-release.bat
View file

@ -2,7 +2,7 @@ call tools\setup-common.bat
set build_dir=build-release set build_dir=build-release
set build_type=Release set build_type=Release
set qt_version=6.7.1 set qt_version=6.7.2
mkdir %build_dir% mkdir %build_dir%
cmake -B %build_dir% -S . ^ cmake -B %build_dir% -S . ^

2
setup-release.sh
View file

@ -3,7 +3,7 @@
build_dir=${1:-build-release} build_dir=${1:-build-release}
build_type=Release build_type=Release
qt_version=6.7.1 qt_version=6.7.2
script_dir="$(dirname "$(readlink -f "$0")")" script_dir="$(dirname "$(readlink -f "$0")")"
mkdir -p ${build_dir} mkdir -p ${build_dir}