diff options
| -rw-r--r-- | configure.json | 14 | ||||
| -rw-r--r-- | mkspecs/features/configure.prf | 22 | ||||
| m--------- | src/3rdparty | 0 |
3 files changed, 26 insertions, 10 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" diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 9b0be0140..b293a5efa 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -36,6 +36,8 @@ defineTest(runConfigure) { else: WEBENGINE_CONFIG += use_bundled_opus qtConfig(system-ffmpeg): WEBENGINE_CONFIG += use_system_ffmpeg else: WEBENGINE_CONFIG += use_bundled_ffmpeg + qtConfig(system-icu): WEBENGINE_CONFIG += use_system_icu + else: WEBENGINE_CONFIG += use_bundled_icu } else { cross_compile: WEBENGINE_CONFIG += embedded_build reduce_binary_size } @@ -136,18 +138,18 @@ defineTest(runConfigure) { unix:!darwin { log("System library dependencies:$${EOL}") - use?(system_icu) { - packagesExist("icu-uc icu-i18n") { - log(" ICU ................................ Using system version$${EOL}") + !isQtMinimum(5, 8) { + use?(system_icu) { + packagesExist("\'icu-uc >= 53\', \'icu-i18n >= 53\'") { + log(" ICU ................................ Using system version$${EOL}") + } else { + log(" ICU ................................ System ICU not found$${EOL}") + skipBuild("Unmet dependencies: icu-uc, icu-i18n") + } } else { - log(" ICU ................................ System ICU not found$${EOL}") - skipBuild("Unmet dependencies: icu-uc, icu-i18n") + log(" ICU ................................ Using internal copy (Default, force system ICU with WEBENGINE_CONFIG+=use_system_icu)$${EOL}") + WEBENGINE_CONFIG += use_bundled_icu } - } else { - log(" ICU ................................ Using internal copy (Default, force system ICU with WEBENGINE_CONFIG+=use_system_icu)$${EOL}") - WEBENGINE_CONFIG += use_bundled_icu - } - !isQtMinimum(5, 8) { use?(system_ffmpeg) { packagesExist("libavcodec libavformat libavutil") { packagesExist("libwebp, libwebpdemux, opus, \'vpx >= 1.4\'"){ diff --git a/src/3rdparty b/src/3rdparty -Subproject 898afbbf79637101bbd5e6ab12695ced6a759ae +Subproject 84565a8dbfae245b7fcce6ba451cdc1f4a9977b |