AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow building against static ICU libs also on Unix

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.tests/unix/icu/icu.pro
View File

@ -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
}

4
src/corelib/tools/tools.pri
View File

@ -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