diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-04-24 13:49:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 14:42:26 +0200 |
| commit | 159465536f0dd1a373f0c67e5530f9af6ccec433 (patch) | |
| tree | 0fd9ea4966c76a703b42380811c5b1b8e9983d4c | |
| parent | f1eefd6cf99b2784b10390b7accf6bbe49245906 (diff) | |
Allow building against static ICU libs also on Unix
For dynamic builds of ICU, libicudata is an implicit dependency. Anyhow,
it doesn't harm to explicitly link against it, either. So let's do
this everywhere ...
Task-number: QTBUG-38445
Change-Id: I420ba096e2ce5e1b8d81814ffb4aa7b300143b01
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | config.tests/unix/icu/icu.pro | 5 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro index 2c1b431f92..16267ff827 100644 --- a/config.tests/unix/icu/icu.pro +++ b/config.tests/unix/icu/icu.pro @@ -1,6 +1,7 @@ SOURCES = icu.cpp CONFIG += console CONFIG -= qt dylib + win32 { CONFIG(static, static|shared) { CONFIG(debug, debug|release) { @@ -9,8 +10,8 @@ win32 { LIBS += -lsicuin -lsicuuc -lsicudt } } else { - LIBS += -licuin -licuuc + LIBS += -licuin -licuuc -licudt } } else { - LIBS += -licui18n -licuuc + LIBS += -licui18n -licuuc -licudata } diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 863cf03439..57a9591060 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -163,10 +163,10 @@ contains(QT_CONFIG,icu) { LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt } } else { - LIBS_PRIVATE += -licuin -licuuc + LIBS_PRIVATE += -licuin -licuuc -licudt } } else { - LIBS_PRIVATE += -licui18n -licuuc + LIBS_PRIVATE += -licui18n -licuuc -licudata } } else: win32 { SOURCES += tools/qcollator_win.cpp |