diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 19:12:38 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-20 10:43:09 +0000 |
| commit | 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 (patch) | |
| tree | daf2617622536fc9c96ed9818ecba3d892f999b7 /configure.json | |
| parent | c9b3baa2e2825df6b06e7366d154341f73d4e326 (diff) | |
Remove WEBENGINE_CONFIG from configure
Do not store flags in qmake.cache with WEBENGINE_CONFIG.
Use directly qtConfig values insted. This makes configuration
more consistent, simplifies handling and avoids passing
values from qtConfig to WEBENIGNE_CONFIG, which then
were passed to gn.
[ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure
Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.json b/configure.json index f2cd78343..c89012352 100644 --- a/configure.json +++ b/configure.json @@ -11,7 +11,7 @@ "webengine-icu": { "type": "enum", "name": "system-icu", "values": { "system": "yes", "qt": "no" } }, "ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, "opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } }, - "webp": { "type": "enum", "name": "system-webp", "values": { "system": "yes", "qt": "no" } }, + "webp": { "type": "enum", "name": "system-libwebp", "values": { "system": "yes", "qt": "no" } }, "pepper-plugins": "boolean", "printing-and-pdf": "boolean", "proprietary-codecs": "boolean", @@ -436,8 +436,9 @@ "native-spellchecker": { "label": "Native Spellchecker", "purpose": "Provides a native spellchecker.", - "condition": "config.macos", "section": "WebEngine", + "autoDetect": false, + "condition": "config.macos && features.spellchecker", "output": [ "privateFeature" ] }, "ui-delegates": { @@ -461,7 +462,7 @@ "condition": "config.unix && !config.darwin && libs.nss", "output": [ "privateFeature" ] }, - "system-webp": { + "system-libwebp": { "label": "libwebp, libwebpmux and libwebpdemux", "autoDetect": "config.unix", "condition": "libs.webp", @@ -476,7 +477,7 @@ "system-ffmpeg": { "label": "ffmpeg", "autoDetect": false, - "condition": "libs.ffmpeg && features.system-opus && features.system-webp", + "condition": "libs.ffmpeg && features.system-opus && features.system-libwebp", "output": [ "privateFeature" ] }, "system-icu": { @@ -572,7 +573,7 @@ "entries": [ "system-re2", "system-icu", - "system-webp", + "system-libwebp", "system-opus", "system-ffmpeg", "system-libvpx", |