From 6ad203f231525374666b5c1e565d4070496d0c79 Mon Sep 17 00:00:00 2001 From: pajlada Date: Mon, 5 Feb 2024 11:59:41 +0100 Subject: [PATCH] chore: Build with Qt6 by default on Windows (#5155) Co-authored-by: nerix --- .github/workflows/build.yml | 6 ++++++ CHANGELOG.md | 1 + CMakeLists.txt | 6 +++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62b7228da..97e9a479b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,6 +106,12 @@ jobs: echo "C2_BUILD_WITH_QT6=ON" >> "$GITHUB_ENV" shell: bash + - name: Disable BUILD_WITH_QT6 + if: startsWith(matrix.qt-version, '5.') + run: | + echo "C2_BUILD_WITH_QT6=OFF" >> "$GITHUB_ENV" + shell: bash + - uses: actions/checkout@v4 with: submodules: recursive diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c3fac3c..82851cf34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,7 @@ - Dev: Removed `Outcome` from network requests. (#4959) - Dev: Added Tests for Windows and MacOS in CI. (#4970, #5032) - Dev: Added "Copy message as JSON" option when shift-right-clicking a message. (#5150) +- Dev: Windows now builds with Qt6 by default. (#5155) - Dev: Move `clang-tidy` checker to its own CI job. (#4996) - Dev: Refactored the Image Uploader feature. (#4971) - Dev: Refactored the SplitOverlay code. (#5082) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6b8281e1..14efcb0da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,11 @@ option(BUILD_WITH_QTKEYCHAIN "Build Chatterino with support for your system key option(USE_SYSTEM_MINIAUDIO "Build Chatterino with your system miniaudio" OFF) option(BUILD_WITH_CRASHPAD "Build chatterino with crashpad" OFF) option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) -option(BUILD_WITH_QT6 "Use Qt6 instead of default Qt5" OFF) +if(WIN32) + option(BUILD_WITH_QT6 "Build with Qt6, default on for Windows" On) +else() + option(BUILD_WITH_QT6 "Use Qt6 instead of default Qt5" OFF) +endif() option(CHATTERINO_GENERATE_COVERAGE "Generate coverage files" OFF) # We don't use translations, and we don't want qtkeychain to build translations option(BUILD_TRANSLATIONS "" OFF)