diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-12-18 13:41:39 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-01-08 14:33:04 +0000 |
| commit | 26ffb70f5748e0e7340d88681f2841ae246a8e7e (patch) | |
| tree | 7287fb144142b13c60e88d5cd8066556c6399bf4 | |
| parent | 56fd6e23f4900bb712bf3139232eadac5b6b7223 (diff) | |
Prefix icu library in configure.json to prevent build issues on Win32
Both qtbase/src/corelib/configure.json and qtwebengine/configure.json
declare the "icu" library, but the definitions of the library are
different. Make sure to prefix the webengine "icu" declaration, so that
it does not override the qtbase one.
This is a partial backport of commit
2ed1e0ba423a75f68c1547fe0c06e62e773ef64d which was introduced in
Qt 5.10.0.
The rest of the library definitions are not conflicting at the moment.
Task-number: QTBUG-62944
Change-Id: If5cbf07a5bab149c7663ce05c7eb8183c5f63300
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 6aab3f3c9..be8beebd7 100644 --- a/configure.json +++ b/configure.json @@ -35,7 +35,7 @@ { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } ] }, - "icu": { + "webengine-icu": { "label": "icu >= 53", "sources": [ { "type": "pkgConfig", "args": "icu-uc >= 53 icu-i18n >= 53" } @@ -169,7 +169,7 @@ "system-icu": { "label": "ICU", "autoDetect": false, - "condition": "libs.icu", + "condition": "libs.webengine-icu", "output": [ "privateFeature" ] }, "system-re2": { |