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-15 08:49:46 +0200
commitf938dfcd1f42a1e925283a3b91e6714d416838da (patch)
tree39be0f2cd751b3b1725b8b75c7bee537818b45d8
parent2d477036d3673a39e87a7d9fed8da2a8993bf9af (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.6 6.5 Task-number: QTBUG-123489 Fixes: QTBUG-124304 Change-Id: I3313bdcb971bd480c92b3f0946610b4130396c58 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 86c9f944ac937859b20538b868c0de068bc098aa) Reviewed-by: Inho Lee <inho.lee@qt.io>
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51fdc9e67..6649dfccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,10 @@ endif()
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
Core
- Gui
)
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
+ Gui
OpenGL
Quick
)
@@ -40,4 +40,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()