diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-10-16 14:54:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-21 11:40:35 +0000 |
| commit | e85835c5a824c1979ace67aa3940c0fbdca40fd6 (patch) | |
| tree | ae22fac7380308895c3d5142d7e73a6a1e6d88b0 /src/core | |
| parent | 819182302d5bdaba41efb68ef3c533b2acc19ae1 (diff) | |
Add configure for webengine and webenginewidgets
Add possibility to build without widgets or qml support.
Move module related options to webengine's subconfigure.
Make proper dependencies between qml_module and qml_plugins.
Cleanup headers.
Fixes: QTBUG-68956
Task-number: QTBUG-70784
Change-Id: I4605d98b0d2c83c99af37e2186b5fbf10f8a6049
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/configure.json | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 044d85527..4d2555dd2 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -25,6 +25,8 @@ "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" } }, @@ -546,15 +548,6 @@ "condition": "config.macos && features.webengine-spellchecker", "output": [ "publicFeature" ] }, - "webengine-ui-delegates": { - "label": "UI Delegates", - "output": [ "privateFeature" ] - }, - "webengine-testsupport": { - "label": "Test Support", - "autoDetect": "features.private_tests || call.isTestsInBuildParts", - "output": [ "privateFeature" ] - }, "webengine-webrtc": { "label": "WebRTC", "purpose": "Provides WebRTC support.", @@ -657,6 +650,19 @@ "label": "Thumb instruction set", "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" ] } }, @@ -705,8 +711,10 @@ "summary": [ { - "section": "Qt WebEngine", + "section": "Qt WebEngineCore", "entries": [ + "webengine-widgets", + "webengine-qml", "webengine-embedded-build", "webengine-pepper-plugins", "webengine-printing-and-pdf", |