1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce icu_dependency.pri

Browse Source 
Simply to hide the magic bahind the scenes.

Change-Id: I69a159eb14712e68117f10e78745bdfbad46b6f2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2015-03-20 17:05:53 +04:00
parent 975260503a
commit 0a27532890
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,4 @@ SOURCES = icu.cpp
CONFIG += console
CONFIG -= qt dylib
win32 {
CONFIG(static, static|shared) {
CONFIG(debug, debug|release) {
LIBS += -lsicuind -lsicuucd -lsicudtd
} else {
LIBS += -lsicuin -lsicuuc -lsicudt
}
} else {
LIBS += -licuin -licuuc -licudt
}
} else {
LIBS += -licui18n -licuuc -licudata
}
include($$PWD/../../../src/3rdparty/icu_dependency.pri)

13
src/3rdparty/icu_dependency.pri vendored Normal file
View File

@ -0,0 +1,13 @@
win32 {
CONFIG(static, static|shared) {
CONFIG(debug, debug|release) {
LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
} else {
LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
}
} else {
LIBS_PRIVATE += -licuin -licuuc -licudt
}
} else {
LIBS_PRIVATE += -licui18n -licuuc -licudata
}

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

@ -161,23 +161,12 @@ contains(QT_CONFIG, zlib) {
}
contains(QT_CONFIG,icu) {
include($$PWD/../../3rdparty/icu_dependency.pri)
SOURCES += tools/qlocale_icu.cpp \
tools/qcollator_icu.cpp \
tools/qtimezoneprivate_icu.cpp
DEFINES += QT_USE_ICU
win32 {
CONFIG(static, static|shared) {
CONFIG(debug, debug|release) {
LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
} else {
LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
}
} else {
LIBS_PRIVATE += -licuin -licuuc -licudt
}
} else {
LIBS_PRIVATE += -licui18n -licuuc -licudata
}
} else: win32 {
SOURCES += tools/qcollator_win.cpp
} else: macx {