actually make use of the detected ICU
Task-number: QTBUG-58012 Change-Id: I7a3d99277daa6566811b24111205548b89e77c53 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
parent
2fb9705521
commit
afdc4f439c
13
src/3rdparty/icu_dependency.pri
vendored
13
src/3rdparty/icu_dependency.pri
vendored
@ -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
|
|
||||||
}
|
|
@ -44,7 +44,6 @@
|
|||||||
},
|
},
|
||||||
"icu": {
|
"icu": {
|
||||||
"label": "ICU",
|
"label": "ICU",
|
||||||
"export": "",
|
|
||||||
"test": "unix/icu",
|
"test": "unix/icu",
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
|
@ -138,7 +138,7 @@ qtConfig(system-zlib) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
qtConfig(icu) {
|
qtConfig(icu) {
|
||||||
include($$PWD/../../3rdparty/icu_dependency.pri)
|
QMAKE_USE_PRIVATE += icu
|
||||||
|
|
||||||
SOURCES += tools/qlocale_icu.cpp \
|
SOURCES += tools/qlocale_icu.cpp \
|
||||||
tools/qcollator_icu.cpp
|
tools/qcollator_icu.cpp
|
||||||
|
Loading…
Reference in New Issue
Block a user