From 0a275328904b8b66cc80e36b627a48c35b13c205 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 20 Mar 2015 17:05:53 +0400 Subject: Introduce icu_dependency.pri Simply to hide the magic bahind the scenes. Change-Id: I69a159eb14712e68117f10e78745bdfbad46b6f2 Reviewed-by: Oswald Buddenhagen --- src/3rdparty/icu_dependency.pri | 13 +++++++++++++ src/corelib/tools/tools.pri | 15 ++------------- 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 src/3rdparty/icu_dependency.pri (limited to 'src') 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 { -- cgit v1.2.3