diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-12 11:18:27 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-07-02 15:38:25 +0000 |
| commit | afdc4f439c82cfa70f6fb6a66c816ba540226f43 (patch) | |
| tree | af49a6cd3ba3d9031409660cbbecd6eb4a58ffb9 | |
| parent | 2fb9705521bc2879dc89b54c1488d6a20a310d85 (diff) | |
actually make use of the detected ICU
Task-number: QTBUG-58012
Change-Id: I7a3d99277daa6566811b24111205548b89e77c53
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/3rdparty/icu_dependency.pri | 13 | ||||
| -rw-r--r-- | src/corelib/configure.json | 1 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/src/3rdparty/icu_dependency.pri b/src/3rdparty/icu_dependency.pri deleted file mode 100644 index 6318631f6e..0000000000 --- a/src/3rdparty/icu_dependency.pri +++ /dev/null @@ -1,13 +0,0 @@ -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/configure.json b/src/corelib/configure.json index deb7a544ef..2b3efbeb15 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -44,7 +44,6 @@ }, "icu": { "label": "ICU", - "export": "", "test": "unix/icu", "sources": [ { diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index b93ec824ed..b705d4221a 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -138,7 +138,7 @@ qtConfig(system-zlib) { } qtConfig(icu) { - include($$PWD/../../3rdparty/icu_dependency.pri) + QMAKE_USE_PRIVATE += icu SOURCES += tools/qlocale_icu.cpp \ tools/qcollator_icu.cpp |