From 44094f7f91896d2e558011ae0e0b9f8819219e06 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 22 Sep 2023 22:15:36 -0500 Subject: [PATCH] Update to Qt 6.6.0 Currently in Beta 4, upgrading early to fix regression in 6.5.2 that impacts screen detection on Windows --- .github/workflows/ci.yml | 4 ++-- setup-debug.bat | 2 +- setup-debug.sh | 2 +- setup-release.bat | 2 +- setup-release.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9c743b5..ef95a8a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: '' @@ -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: '' diff --git a/setup-debug.bat b/setup-debug.bat index 2102a75e..e0e83705 100644 --- a/setup-debug.bat +++ b/setup-debug.bat @@ -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 diff --git a/setup-debug.sh b/setup-debug.sh index 74e4b150..a86a7dbb 100755 --- a/setup-debug.sh +++ b/setup-debug.sh @@ -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 .. diff --git a/setup-release.bat b/setup-release.bat index 593e3b69..802a6bbc 100644 --- a/setup-release.bat +++ b/setup-release.bat @@ -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 diff --git a/setup-release.sh b/setup-release.sh index f85f1eaf..7b06081a 100755 --- a/setup-release.sh +++ b/setup-release.sh @@ -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 ..