Add webenginewidgets to configure system

Make webeninge-qml webengine-widgets features indpendent
of webenginecore.

Change-Id: I11c1bfaf4a15e4cb3acf2751b367f2c92a7ac833
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 45 insertions, 20 deletions

diff --git a/configure.json b/configure.json
index 60b7342f7..9c49729be 100644
--- a/configure.json
+++ b/configure.json
@@ -1,6 +1,7 @@
 {
     "subconfigs": [
         "src/core",
-        "src/webengine"
+        "src/webengine",
+        "src/webenginewidgets"
     ]
 }
diff --git a/src/core/configure.json b/src/core/configure.json
index 66e39ddc2..d3e0f87e0 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -28,8 +28,6 @@
             "webengine-v8-snapshot": "boolean",
             "webengine-webchannel": "boolean",
             "webengine-kerberos": "boolean",
-            "webengine-widgets": "boolean",
-            "webengine-qml": "boolean",
             "alsa": { "type": "boolean", "name": "webengine-alsa" },
             "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
             "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
@@ -684,19 +682,6 @@
             "condition": "config.linux && features.webengine-embedded-build && arch.arm && tests.webengine-arm-thumb",
             "output": [ "privateFeature" ]
         },
-        "webengine-widgets": {
-            "label": "Qt WebEngine Widgets",
-            "purpose": "Provides WebEngine Widgets support.",
-            "section": "WebEngine",
-            "condition": "module.widgets",
-            "output": [ "privateFeature" ]
-        },
-        "webengine-qml": {
-            "label": "Qt WebEngine Qml",
-            "purpose": "Provides WebEngine Qml support.",
-            "section": "WebEngine",
-            "output": [ "privateFeature" ]
-        },
         "webengine-full-debug-info": {
             "label": "Full debug information",
             "purpose": "Enables debug information for Blink and V8.",
@@ -761,8 +746,6 @@
         {
             "section": "Qt WebEngineCore",
             "entries": [
-                "webengine-widgets",
-                "webengine-qml",
                 "webengine-embedded-build",
                 "webengine-full-debug-info",
                 "webengine-pepper-plugins",
diff --git a/src/src.pro b/src/src.pro
index 30562686a..8bf014dea 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,5 +1,7 @@
 include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri)
-QT_FOR_CONFIG += webenginecore webenginecore-private
+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
 
 TEMPLATE = subdirs
 
diff --git a/src/webengine/configure.json b/src/webengine/configure.json
index ec5ad34d9..ebe1ddb2b 100644
--- a/src/webengine/configure.json
+++ b/src/webengine/configure.json
@@ -1,9 +1,20 @@
 {
     "module": "webengine",
+    "condition": "module.webenginecore && features.webengine-qml",
     "depends": [
         "webenginecore-private"
     ],
+    "commandline": {
+        "options": {
+            "webengine-qml": "boolean"
+        }
+    },
     "features": {
+        "webengine-qml": {
+            "label": "Support Qt WebEngine Qml",
+            "purpose": "Provides WebEngine Qml support.",
+            "output": [ "privateFeature" ]
+        },
         "webengine-ui-delegates": {
             "label": "UI Delegates",
             "section": "WebEngine",
@@ -18,8 +29,8 @@
     "summary": [
         {
             "section": "Qt WebEngineQml",
-            "condition": "features.webengine-qml",
             "entries": [
+                "webengine-qml",
                 "webengine-ui-delegates",
                 "webengine-testsupport"
             ]
diff --git a/src/webenginewidgets/configure.json b/src/webenginewidgets/configure.json
new file mode 100644
index 000000000..a27faf78d
--- /dev/null
+++ b/src/webenginewidgets/configure.json
@@ -0,0 +1,28 @@
+{
+    "module": "webenginewidgets",
+    "condition": "module.webenginecore && features.webengine-widgets",
+    "depends": [
+        "webenginecore-private"
+    ],
+    "commandline": {
+        "options": {
+            "webengine-widgets": "boolean"
+        }
+    },
+    "features": {
+       "webengine-widgets": {
+            "label": "Support Qt WebEngine Widgets",
+            "purpose": "Provides WebEngine Widgets support.",
+            "condition": "module.widgets",
+            "output": [ "privateFeature" ]
+        }
+    },
+    "summary": [
+        {
+            "section": "Qt WebEngineWidgets",
+            "entries": [
+                "webengine-widgets"
+            ]
+        }
+    ]
+}