summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInho Lee <inho.lee@qt.io>2024-04-12 08:17:40 +0000
committerInho Lee <inho.lee@qt.io>2024-04-12 10:21:13 +0000
commit86c9f944ac937859b20538b868c0de068bc098aa (patch)
treecf8acbfbc8bca098c8c8dd581177588cc59702b2
parent171e1d0d2761ba64cb15edbd32d02fb50ef57d28 (diff)
Revert "Make Qt::Gui as a required module"
This reverts commit 9848b60e684ba2fcddff8218d893f45166a34639. Reason for revert: QTBUG-123489's root cause might not be here. The log shows Qt6Gui exists but build tools cannot find it. It will be fixed with another patch. Pick-to: 6.7 6.6 6.5 Task-number: QTBUG-123489 Fixes: QTBUG-124304 Change-Id: I3313bdcb971bd480c92b3f0946610b4130396c58 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c31eddd1e..c498e15b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@ endif()
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
Core
- Gui
)
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
DBus
+ Gui
OpenGL
Quick
Svg
@@ -42,4 +42,8 @@ find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
# return()
#endif()
# special case end
+if(NOT TARGET Qt::Gui)
+ message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.")
+ return()
+endif()
qt_build_repo()