diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-29 10:32:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-29 08:33:31 +0000 |
| commit | 95ca17c45aea718cade487640edc63e08bc23820 (patch) | |
| tree | 53d6cc2102d18ed4b143cb69b378cbbeba7faee4 /configure.json | |
| parent | fdbc265de10fe173b0c38e0be4c6e3eed1dc65b7 (diff) | |
| parent | 73f7be5b2a95eab3dce11caede538eeb7beb71f2 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: Iba6114263488d6bf84b255b38182904dc5880386
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 f9719b3c6..e82247ec5 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": [ @@ -154,6 +161,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", @@ -200,6 +213,7 @@ "section": "System libraries", "condition": "config.unix", "entries": [ + "system-icu", "system-webp", "system-opus", "system-ffmpeg" |