diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-06 17:18:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-07 14:33:43 +0200 |
| commit | 8a45662b7eb920b4070d1c3f62684ab37ae73adb (patch) | |
| tree | d1e22dec100368090da3ca9658decd3ad5aaaad5 /src/core | |
| parent | 3339e2857ecd574cca5b5f96c3a2bb7fa7b5dfc5 (diff) | |
Remove icu-config workaround and add libraries for eLinux
We require that the icu libs are in the default library
seach path since we build embedded with use_system_icu=1.
This patch also updates the chromium patches and the
shasum of the submodule.
Change-Id: Ica43fa45e9f5eac712019f5437bb9fde0896e49a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 51f8c61f0..af2874c3b 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -63,7 +63,6 @@ 'defines!': [ 'OPENSSLDIR="/etc/ssl"', ], - 'ldflags!': ['<!@(icu-config --ldflags)'], # remove garbage added by icu.gyp 'target_conditions': [ ['_type=="shared_library"', { 'ldflags': [ @@ -71,6 +70,13 @@ '-Wl,-shared,-Bsymbolic', ], }], + ['_toolset=="target"', { + 'libraries': [ + '-licui18n', + '-licuuc', + '-licudata', + ], + }], ], }, }], |