1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yield a configuration error with -no-feature-desktopservices

Browse Source 
Yield a configuration error with -no-feature-desktopservices
if the platform is either Apple or Android. This should be clearer
than a compiler error later on, and also occurs earlier in the
process.

Pick-to: 6.8
Fixes: QTBUG-135152
Change-Id: I5dfb9eda12472ed9359767f17423fda63d208d9c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit b145f23770a2f88fc54eaaa33eef579c308f4663)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Juha Vuolle 2025-03-28 14:22:46 +02:00 committed by Qt Cherry-pick Bot
parent 3e67c1241a
commit 5ef7bf98a1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/configure.cmake
View File

@ -1480,3 +1480,8 @@ qt_configure_add_report_entry(
MESSAGE "XCB plugin requires xkbcommon and xkbcommon-x11, but -no-xkbcommon was provided."
CONDITION ( NOT INPUT_xcb STREQUAL '' ) AND ( NOT INPUT_xcb STREQUAL 'no' ) AND INPUT_xkbcommon STREQUAL 'no'
)
qt_configure_add_report_entry(
TYPE ERROR
MESSAGE "The desktopservices feature is required on macOS, iOS, and Android and cannot be disabled."
CONDITION (APPLE OR ANDROID) AND NOT QT_FEATURE_desktopservices
)