diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro index 16267ff827b510ab4202928dfcb8f15c33bc8a51..f92d7cdfb8586dd693ce33809f3370f29b9c926d 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 0000000000000000000000000000000000000000..6318631f6e031511b88b978644eabe5894b0297f --- /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 c4c347d6ff5d5965d75a9c87479fb61742edc950..bf20154b56bb7d58f2c9ce5a17f3bb0217f57978 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 {