summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-09-03 13:57:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-05 17:26:11 +0000
commit9a500602366fad6fce70090d4ea6e9055048218a (patch)
treea264c91e8ba2c8f5e5c51a550880ea6cf541158f
parente2fac3ba8f6d9cefc37ad8b044534571122c3750 (diff)
Disable widgets and quick in case of no core
No webengine build can be also specified from command line. Change-Id: I812c871dfbab4b34c650e67344af835f421ea61c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 572c8163145164e3df4774354339ad85630c2941) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8c331738..ec0f556dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,8 +26,6 @@ if(NOT ${QtWebEngine_SUPPORT})
)
message("-- Support check for QtWebEngine failed: ${QtWebEngine_ERROR}")
set(QT_FEATURE_qtwebengine_build OFF CACHE BOOL "Build QtWebEngine" FORCE)
- set(QT_FEATURE_qtwebengine_widgets_build OFF CACHE BOOL "Build QtWebEngineWidgets" FORCE)
- set(QT_FEATURE_qtwebengine_quick_build OFF CACHE BOOL "Build QtWebEngineQuick" FORCE)
endif()
if(NOT ${QtPdf_SUPPORT})
@@ -46,6 +44,11 @@ if(NOT QT_FEATURE_qtwebengine_build AND NOT QT_FEATURE_qtpdf_build)
return()
endif()
+if(NOT QT_FEATURE_qtwebengine_build)
+ set(QT_FEATURE_qtwebengine_widgets_build OFF CACHE BOOL "Build QtWebEngineWidgets" FORCE)
+ set(QT_FEATURE_qtwebengine_quick_build OFF CACHE BOOL "Build QtWebEngineQuick" FORCE)
+endif()
+
##
# MODULES
##