From 787a8c99a5022432e6171de2d8ab24f53780053f Mon Sep 17 00:00:00 2001 From: nerix Date: Sun, 5 Oct 2025 12:48:47 +0200 Subject: [PATCH] fix: set Qt definitions `PUBLIC` in chatterino-lib/-version (#6520) --- CHANGELOG.md | 1 + src/CMakeLists.txt | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93bdbb4f..9f03fdf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Dev: Merged emote element flags from different providers into two. (#6511) - Dev: Removed unused method in `Emojis`. (#6517) - Dev: Refactored `Emotes` into `EmoteController`. (#6516) +- Dev: Added Qt keyword and warning flags project wide. (#6520) - Def: Fixed compilation error in tests with Clang 21. (#6519) ## 2.5.4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1aed747c..8de33353 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,8 @@ set(LIBRARY_PROJECT "${PROJECT_NAME}-lib") set(VERSION_PROJECT "${LIBRARY_PROJECT}-version") set(EXECUTABLE_PROJECT "${PROJECT_NAME}") -add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060403) -add_compile_definitions(QT_WARN_DEPRECATED_UP_TO=0x060403) -add_compile_definitions(QT_NO_KEYWORDS) +# used for QT_DISABLE_DEPRECATED_BEFORE/QT_WARN_DEPRECATED_UP_TO +set(CHATTERINO_MIN_QT_VERSION 0x060403) # registers the native messageing host option(CHATTERINO_DEBUG_NATIVE_MESSAGES "Debug native messages" OFF) @@ -1079,6 +1078,14 @@ target_compile_definitions(${LIBRARY_PROJECT} PUBLIC $<$:CHATTERINO_WITH_TESTS> ) +set(_c2_qt_defs + QT_DISABLE_DEPRECATED_BEFORE=${CHATTERINO_MIN_QT_VERSION} + QT_WARN_DEPRECATED_UP_TO=${CHATTERINO_MIN_QT_VERSION} + QT_NO_KEYWORDS +) +target_compile_definitions(${VERSION_PROJECT} PUBLIC ${_c2_qt_defs}) +target_compile_definitions(${LIBRARY_PROJECT} PUBLIC ${_c2_qt_defs}) + if (USE_SYSTEM_QTKEYCHAIN) target_compile_definitions(${LIBRARY_PROJECT} PUBLIC CMAKE_BUILD