diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-02-18 08:35:48 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-03-01 13:13:12 +0000 |
| commit | eda6a3559b303c9e13d755efd4af17fbe2ac9c95 (patch) | |
| tree | 5f3277f5690c2c18c5d91ec6f6894e11a8d2b6de /src/core/qtwebengine.gypi | |
| parent | b4ef618b999eab335911a13d185d29e71f1ff5e2 (diff) | |
ICU: Do not try to search for icudtl.dat for WEBENGINE_CONFIG+=system_icu
Do not try to find icudt.dat if we use system ICU. This
avoids warnings like
Qt WebEngine ICU data not found at /usr/share/qt5/resources. Trying parent directory...
Qt WebEngine ICU data not found at /usr/share/qt5. Trying application directory...
Qt WebEngine ICU data not found at /bin. Trying fallback directory... The application MAY NOT work.
on every startup, e.g. for embedded linux. The defines and macros
are the same as in chromium.
Task-number: QTBUG-51156
Change-Id: I6c24b73cca88020504489695e889f49c5d7be424
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/qtwebengine.gypi')
| -rw-r--r-- | src/core/qtwebengine.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 96b48e2ca..fc5f17281 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -119,5 +119,16 @@ ['OS=="mac"', { 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, }], + ['icu_use_data_file_flag==1', { + 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], + }, { # else icu_use_data_file_flag !=1 + 'conditions': [ + ['OS=="win"', { + 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], + }, { + 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], + }], + ], + }], ], } |