summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.cpp
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-04-05 02:28:37 +0300
committerQt by Nokia <qt-info@nokia.com>2012-04-11 01:42:12 +0200
commit3b778df102e82a7cf4b1db7fca0bcfeadfe98857 (patch)
treedaf5cb972db97721374abc3eceed7985cc5dee6d /src/corelib/tools/qstring.cpp
parent8e74b5cfe43893522c0f06d0b0d0dd5b7393aa6f (diff)
minor improvement for NormalizationCorrections
let's don't hardcode the latests affected version value and simply use the one parsed from NormalizationCorrections.txt Change-Id: I37021e8238d77deada4c5ba7a2d160c87186b9dd Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
-rw-r--r--src/corelib/tools/qstring.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index f263c0b1db..81fa3bc544 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -6212,8 +6212,8 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::
return;
if (version == QChar::Unicode_Unassigned) {
- version = UNICODE_DATA_VERSION;
- } else if (version != UNICODE_DATA_VERSION) {
+ version = QChar::currentUnicodeVersion();
+ } else if (int(version) <= NormalizationCorrectionsVersionMax) {
const QString &s = *data;
QChar *d = 0;
for (int i = 0; i < NumNormalizationCorrections; ++i) {