Rename option webengine-core to build-qtwebengine-core

This change is extracted from qtpdf branch to keep following
commits unchanged.

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

3 files changed, 39 insertions, 38 deletions

diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 8ddff6b2c..ef4965f34 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -7,7 +7,7 @@
     ],
     "commandline": {
         "options": {
-            "webengine-core": "boolean",
+            "build-qtwebengine-core": "boolean",
             "webengine-jumbo-build": { "type": "optionalString", "name": "merge_limit"}
         }
     },
@@ -362,7 +362,7 @@
         }
     },
     "features": {
-        "webengine-core": {
+        "build-qtwebengine-core": {
             "label": "Support Qt WebEngine Core",
             "purpose": "Provides WebEngine Core support.",
             "condition": "module.gui
@@ -697,7 +697,7 @@
                 "webengine-developer-build",
                 {
                     "section": "Required system libraries",
-                    "condition": "config.unix && !config.macos && features.webengine-core",
+                    "condition": "config.unix && !config.macos && features.build-qtwebengine-core",
                     "entries": [
                         "webengine-system-fontconfig",
                         "webengine-system-dbus",
@@ -708,7 +708,7 @@
                 },
                 {
                     "section": "Required system libraries for qpa-xcb",
-                    "condition": "config.unix && !config.macos && features.webengine-core",
+                    "condition": "config.unix && !config.macos && features.build-qtwebengine-core",
                     "entries": [
                         "webengine-system-x11",
                         "webengine-system-libdrm",
diff --git a/src/core/configure.json b/src/core/configure.json
index 41b4b2fbd..b65b8e51e 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -6,7 +6,7 @@
         "gui-private",
         "printsupport"
     ],
-    "condition": "features.webengine-core",
+    "condition": "features.build-qtwebengine-core",
     "testDir": "../../config.tests",
     "commandline": {
         "options": {
@@ -276,7 +276,7 @@
     "summary": [
         {
             "section": "Qt WebEngineCore",
-            "condition": "features.webengine-core",
+            "condition": "features.build-qtwebengine-core",
             "entries": [
                 "webengine-embedded-build",
                 "webengine-full-debug-info",
diff --git a/src/src.pro b/src/src.pro
index 99967fd82..e620fcdd8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,42 +1,43 @@
 load(platform)
 
 include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
-QT_FOR_CONFIG += buildtools-private
+include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri)
+include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri)
+include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri)
+
+QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private webengine-private \
+    webenginewidgets-private
 
 TEMPLATE = subdirs
 
-isWebEngineCoreBuild():qtConfig(webengine-core) {
-    include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri)
-    include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri)
-    include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri)
-    QT_FOR_CONFIG += webenginecore webenginecore-private webengine-private webenginewidgets-private
-
-    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
-
-    core.depends = buildtools
-
-    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
-    }
+isWebEngineCoreBuild(){
 
-    qtConfig(webengine-qml) {
-        SUBDIRS += webengine
-    }
+    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
 
-    qtConfig(webengine-widgets) {
-        SUBDIRS += plugins webenginewidgets
-        plugins.depends = webenginewidgets
+        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
+        }
     }
 } else {
     !isEmpty(skipBuildReason):!build_pass {
@@ -46,5 +47,5 @@ isWebEngineCoreBuild():qtConfig(webengine-core) {
             QMAKE_EXTRA_TARGETS += errorbuild
             first.depends += errorbuild
             QMAKE_EXTRA_TARGETS += first
-   }
+    }
 }