diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 17:05:53 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 18:12:04 +0000 |
| commit | 0a275328904b8b66cc80e36b627a48c35b13c205 (patch) | |
| tree | 8e3624677239df193ee2fc915b20fef00814f40b | |
| parent | 975260503a65725ef0957caf8b61bbca492e90be (diff) | |
Introduce icu_dependency.pri
Simply to hide the magic bahind the scenes.
Change-Id: I69a159eb14712e68117f10e78745bdfbad46b6f2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | config.tests/unix/icu/icu.pro | 14 | ||||
| -rw-r--r-- | src/3rdparty/icu_dependency.pri | 13 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 15 |
3 files changed, 16 insertions, 26 deletions
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro index 16267ff827..f92d7cdfb8 100644 --- a/config.tests/unix/icu/icu.pro +++ b/config.tests/unix/icu/icu.pro @@ -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) diff --git a/src/3rdparty/icu_dependency.pri b/src/3rdparty/icu_dependency.pri new file mode 100644 index 0000000000..6318631f6e --- /dev/null +++ b/src/3rdparty/icu_dependency.pri @@ -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 +} diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index c4c347d6ff..bf20154b56 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -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 { |