diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-28 09:58:11 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-08 18:06:34 +0000 |
| commit | 79759e69ccae1c10bbe78fc0f5d5e0711d7462a2 (patch) | |
| tree | d6e50d3f14a018949d14b274a000aebdf3f77106 /configure.json | |
| parent | 3171311d7f07eb00c967e77ef7170125a4dcb301 (diff) | |
Move ICU configuration to new configure system
The command-line switches is called webengine-icu to avoid conflicting
with icu switches in other modules.
Change-Id: Ic923a199efbc4081b3c30f0cafa4b7ea786bdb00
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 805ed4001..bffbfc2dc 100644 --- a/configure.json +++ b/configure.json @@ -8,6 +8,7 @@ "options": { "alsa": "boolean", "embedded": "boolean", + "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" } }, @@ -34,6 +35,12 @@ { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } ] }, + "icu": { + "label": "icu >= 53", + "sources": [ + { "type": "pkgConfig", "args": "icu-uc >= 53 icu-i18n >= 53" } + ] + }, "ffmpeg": { "label": "libavcodec libavformat libavutil", "sources": [ @@ -148,6 +155,12 @@ "condition": "libs.ffmpeg && features.system-opus && features.system-webp", "output": [ "privateFeature" ] }, + "system-icu": { + "label": "ICU", + "autoDetect": false, + "condition": "libs.icu", + "output": [ "privateFeature" ] + }, "system-ninja": { "label": "Using system ninja", "condition": "tests.ninja", @@ -194,6 +207,7 @@ "section": "System libraries", "condition": "config.unix", "entries": [ + "system-icu", "system-webp", "system-opus", "system-ffmpeg" |