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>
This commit is contained in:
Kai Koehne 2014-04-24 13:49:21 +02:00 committed by The Qt Project
parent f1eefd6cf9
commit 159465536f
2 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,7 @@
SOURCES = icu.cpp SOURCES = icu.cpp
CONFIG += console CONFIG += console
CONFIG -= qt dylib CONFIG -= qt dylib
win32 { win32 {
CONFIG(static, static|shared) { CONFIG(static, static|shared) {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
@ -9,8 +10,8 @@ win32 {
LIBS += -lsicuin -lsicuuc -lsicudt LIBS += -lsicuin -lsicuuc -lsicudt
} }
} else { } else {
LIBS += -licuin -licuuc LIBS += -licuin -licuuc -licudt
} }
} else { } else {
LIBS += -licui18n -licuuc LIBS += -licui18n -licuuc -licudata
} }

View File

@ -163,10 +163,10 @@ contains(QT_CONFIG,icu) {
LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
} }
} else { } else {
LIBS_PRIVATE += -licuin -licuuc LIBS_PRIVATE += -licuin -licuuc -licudt
} }
} else { } else {
LIBS_PRIVATE += -licui18n -licuuc LIBS_PRIVATE += -licui18n -licuuc -licudata
} }
} else: win32 { } else: win32 {
SOURCES += tools/qcollator_win.cpp SOURCES += tools/qcollator_win.cpp