diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-06-01 17:51:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-10 19:08:49 +0200 |
| commit | 97e177e58d195f78ac103b3dd0b8ecedb1e07d4c (patch) | |
| tree | eda9251fd21110f048acd8d5a32d0b32959e642c /src/corelib/tools/tools.pri | |
| parent | c631927b764133ea3c90613262c5a1587b0937a8 (diff) | |
Refactor the ICU code for QLocale
Clean up the ICU code and make it thread-safe. Add a
QIcuData structure to QLocalePrivate, that contains
ICU specific data.
Link against ICU directly, greatly simplifying the
code.
Also fix a bug in the locale specific case conversion
code that would cause it to fail and fall back to the
QString code if the output string was larger than the
input.
Change-Id: Ie67e5ea14fa204ebc5887d7aaeb1a4f3ecaf8697
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 386db9665b..9db459ab68 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -112,6 +112,8 @@ else:include($$PWD/../../3rdparty/zlib_dependency.pri) contains(QT_CONFIG,icu) { SOURCES += tools/qlocale_icu.cpp DEFINES += QT_USE_ICU + win32:LIBS += -licuin -licuuc + else:LIBS += -licui18n -licuuc } pcre { |