Unify error reporting for configure

Move last two tests (submodule and nowhitespace) to configure
system and unify error reporting. Now all error
messages come from one single place qtwebengine_checkErrors().
This function is used by configure system reporting and by make call.
Remove duplicated strings.

Add extra messages when module is not going to be built.

Change-Id: Ib373facd58135325495aad52b6e600ec9a61f31f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 34 insertions, 36 deletions

diff --git a/src/src.pro b/src/src.pro
index 31b91ccab..adb26efdc 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,42 +10,40 @@ QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private webengin
 
 TEMPLATE = subdirs
 
-isWebEngineCoreBuild(){
-
-    qtConfig(build-qtwebengine-core) {
-
-        core.depends = buildtools
-        process.depends = core
-        webengine.depends = core
-        webenginewidgets.depends = core webengine
-        webengine_plugin.subdir = webengine/plugin
-        webengine_plugin.target = sub-webengine-plugin
-        webengine_plugin.depends = webengine
-
-        SUBDIRS += buildtools core process
-
-        qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile {
-            SUBDIRS += qwebengine_convert_dict
-            qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
-            qwebengine_convert_dict.depends = core
-        }
-
-        qtConfig(webengine-qml) {
-            SUBDIRS += webengine
-        }
-
-        qtConfig(webengine-widgets) {
-            SUBDIRS += plugins webenginewidgets
-            plugins.depends = webenginewidgets
-        }
+
+qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) {
+    core.depends = buildtools
+    process.depends = core
+    webengine.depends = core
+    webenginewidgets.depends = core webengine
+    webengine_plugin.subdir = webengine/plugin
+    webengine_plugin.target = sub-webengine-plugin
+    webengine_plugin.depends = webengine
+
+    SUBDIRS += buildtools core process
+
+    qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile {
+        SUBDIRS += qwebengine_convert_dict
+        qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
+        qwebengine_convert_dict.depends = core
+    }
+
+    qtConfig(webengine-qml) {
+        SUBDIRS += webengine
     }
-} else {
-    !isEmpty(skipBuildReason):!build_pass {
-            log(QtWebEngine will not be built. $${skipBuildReason} $${EOL})
-            errorbuild.commands = @echo QtWebEngine will not be built. $${skipBuildReason}
-            errorbuild.CONFIG = phony
-            QMAKE_EXTRA_TARGETS += errorbuild
-            first.depends += errorbuild
-            QMAKE_EXTRA_TARGETS += first
+
+    qtConfig(webengine-widgets) {
+        SUBDIRS += plugins webenginewidgets
+        plugins.depends = webenginewidgets
+    }
+}
+
+!qtConfig(webengine-core-support): qtConfig(build-qtwebengine-core) {
+    !qtwebengine_checkError():!isEmpty(skipBuildReason):!build_pass {
+        errorbuild.commands = @echo Modules will not be built. $${skipBuildReason}
+        errorbuild.CONFIG = phony
+        QMAKE_EXTRA_TARGETS += errorbuild
+        first.depends += errorbuild
+        QMAKE_EXTRA_TARGETS += first
     }
 }