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/content_main_delegate_qt.cpp | |
| 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/content_main_delegate_qt.cpp')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 0688fb015..0a7233853 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -94,10 +94,17 @@ content::ContentRendererClient *ContentMainDelegateQt::CreateContentRendererClie return new ContentRendererClientQt; } +// see icu_util.cc +#define ICU_UTIL_DATA_FILE 0 +#define ICU_UTIL_DATA_SHARED 1 +#define ICU_UTIL_DATA_STATIC 2 + bool ContentMainDelegateQt::BasicStartupComplete(int *exit_code) { PathService::Override(base::FILE_EXE, WebEngineLibraryInfo::getPath(base::FILE_EXE)); +#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE PathService::Override(base::DIR_QT_LIBRARY_DATA, WebEngineLibraryInfo::getPath(base::DIR_QT_LIBRARY_DATA)); +#endif PathService::Override(content::DIR_MEDIA_LIBS, WebEngineLibraryInfo::getPath(content::DIR_MEDIA_LIBS)); PathService::Override(ui::DIR_LOCALES, WebEngineLibraryInfo::getPath(ui::DIR_LOCALES)); |