FIXUP: Fix top level build again

When we are doing top level build QTWEBENGINE_ROOT/QTWEBENGINE_ROOT_OUT
is not present at configure step, therefore add two ways of calling
checkError, one for configure time and one for make call.

Fix typo in submodule's condition. Add a poor man's workaround
for this test.

Change-Id: Ie95ab9ffe262a45c7e1ea49e4795d142b7df716a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

4 files changed, 21 insertions, 9 deletions

diff --git a/configure.pri b/configure.pri
index 054ab283b..acb345ae6 100644
--- a/configure.pri
+++ b/configure.pri
@@ -342,6 +342,10 @@ defineTest(qtConfTest_hasGcc6OrNewer) {
 }
 
 defineTest(qtConfTest_detectSubmodule) {
+    isEmpty(QTWEBENGINE_ROOT) {
+        # topLevel build , add poor man's workaround
+        QTWEBENGINE_ROOT=$$PWD/../../../qtwebengine
+    }
     !exists($$QTWEBENGINE_ROOT/src/3rdparty/chromium):return(false)
     return(true)
 }
@@ -351,3 +355,8 @@ defineTest(qtConfTest_detectNoWhitespace) {
     !isEmpty(WSPC):return(false)
     return(true)
 }
+
+defineTest(qtwebengine_confCheckError) {
+    QT_FOR_CONFIG += buildtools-private gui-private
+    return($$qtwebengine_checkError())
+}
diff --git a/src/buildtools/config/platform.pri b/src/buildtools/config/platform.pri
index c5a8d524f..8ff3da4c3 100644
--- a/src/buildtools/config/platform.pri
+++ b/src/buildtools/config/platform.pri
@@ -163,10 +163,7 @@ defineTest(qtwebengine_skipBuild) {
     export(skipBuildReason)
 }
 
-defineTest(qtwebengine_checkError) {
-
-    include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
-    QT_FOR_CONFIG += buildtools-private gui-private
+defineReplace(qtwebengine_checkError) {
 
     static {
        qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.")
@@ -277,3 +274,9 @@ defineTest(qtwebengine_checkErrorForWindows) {
     }
     return(true)
 }
+
+defineTest(qtwebengine_makeCheckError) {
+    include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
+    QT_FOR_CONFIG += buildtools-private gui-private
+    return($$qtwebengine_checkError())
+}
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index c051b6413..81780f7c7 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -377,10 +377,10 @@
                          && features.webengine-gperf
                          && features.webengine-bison
                          && features.webengine-flex
+                         && features.webengine-submodule
+                         && features.webengine-nowhitespace
                          && tests.webengine-platform
                          && tests.webengine-architecture
-                         && tests.webengine-submodule
-                         && tests.webengine-nowhitespace
                          && !config.static
                          && (!config.linux || features.pkg-config)
                          && (!features.xcb || features.webengine-ozone-x11)
@@ -654,7 +654,7 @@
         },
         "webengine-submodule": {
             "label": "submodule",
-            "condtion": "tests.webengine-submodule",
+            "condition": "tests.webengine-submodule",
             "output": [ "privateFeature" ]
         },
         "webengine-nowhitespace": {
@@ -667,7 +667,7 @@
         {
             "type": "skipBuildWarning",
             "condition": "!features.webengine-core-support && (features.build-qtwebengine-core || features.build-qtpdf)",
-            "message": "qtwebengine_checkError"
+            "message": "qtwebengine_confCheckError"
         },
         {
             "type": "note",
diff --git a/src/src.pro b/src/src.pro
index adb26efdc..de88878a6 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -39,7 +39,7 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) {
 }
 
 !qtConfig(webengine-core-support): qtConfig(build-qtwebengine-core) {
-    !qtwebengine_checkError():!isEmpty(skipBuildReason):!build_pass {
+    !qtwebengine_makeCheckError():!isEmpty(skipBuildReason):!build_pass {
         errorbuild.commands = @echo Modules will not be built. $${skipBuildReason}
         errorbuild.CONFIG = phony
         QMAKE_EXTRA_TARGETS += errorbuild