Split errorChecks for webengine and pdf

Separate error checks, so qtpdf can have own dependencies.

Change-Id: I9e538b875fe67448497f10dcd45c83782d98da2d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 18 insertions, 10 deletions

diff --git a/src/core/core.pro b/src/core/core.pro
index 9709e62c3..3b7aea4f0 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -1,3 +1,5 @@
+include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
+QT_FOR_CONFIG += buildtools-private
 TEMPLATE = subdirs
 
 # core_headers is a dummy module to syncqt the headers so we can
@@ -9,8 +11,6 @@ core_api.file = api/core_api.pro
 core_module.file = core_module.pro
 core_module.depends = core_api
 
-# core_generator.pro is a dummy .pro file that is used by qmake
-# to generate our main .gyp/BUILD.gn file
 core_generator.file = core_generator.pro
 core_generator.depends = core_headers
 
@@ -26,11 +26,19 @@ core_api.depends = gn_run
 core_project.file = core_project.pro
 core_project.depends = gn_run
 
-SUBDIRS += \
-            core_headers \
-            core_generator \
-            gn_run \
-            core_api \
-            core_module
-
-false: SUBDIRS += core_project
+!qtConfig(webengine-core-support):qtConfig(build-qtwebengine-core):!qtwebengine_makeCheckWebEngineCoreError():!build_pass {
+    errorbuild.commands = @echo $$shell_quote(QtWebEngineCore module will not be built. $${skipBuildReason})
+    errorbuild.CONFIG = phony
+    QMAKE_EXTRA_TARGETS += errorbuild
+    first.depends += errorbuild
+    QMAKE_EXTRA_TARGETS += first
+} else {
+    SUBDIRS += \
+        core_headers \
+        core_generator \
+        gn_run \
+        core_api \
+        core_module
+
+    false: SUBDIRS += core_project
+}