Skip to content

Commit

Permalink
Update to Qt 6.6.0
Browse files Browse the repository at this point in the history
Currently in Beta 4, upgrading early to fix regression in 6.5.2 that impacts screen detection on Windows
  • Loading branch information
dpaulat committed Sep 23, 2023
1 parent 48518f0 commit 44094f7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
compiler: msvc
msvc_arch: x64
msvc_version: 2022
qt_version: 6.5.2
qt_version: 6.6.0
qt_arch: win64_msvc2019_64
qt_modules: qtimageformats
qt_tools: ''
Expand All @@ -44,7 +44,7 @@ jobs:
env_cc: gcc-11
env_cxx: g++-11
compiler: gcc
qt_version: 6.5.2
qt_version: 6.6.0
qt_arch: gcc_64
qt_modules: qtimageformats
qt_tools: ''
Expand Down
2 changes: 1 addition & 1 deletion setup-debug.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
call tools\setup-common.bat
mkdir build-debug
cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.2/msvc2019_64 ..
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.6.0/msvc2019_64 ..
pause
2 changes: 1 addition & 1 deletion setup-debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
./tools/setup-common.sh
mkdir -p build-debug
cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/gcc_64 ..
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.6.0/gcc_64 ..
2 changes: 1 addition & 1 deletion setup-release.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
call tools\setup-common.bat
mkdir build-release
cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.2/msvc2019_64 ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.6.0/msvc2019_64 ..
pause
2 changes: 1 addition & 1 deletion setup-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
./tools/setup-common.sh
mkdir -p build-release
cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/gcc_64 ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.6.0/gcc_64 ..

0 comments on commit 44094f7

Please sign in to comment.