diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-10-07 11:56:35 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-10-07 11:56:35 (GMT) |
| commit | 18943d3203a794f3f3173be6ec51c15db83db9e1 (patch) | |
| tree | 8a64ba77d30f3e0e98e0903a10044440477eed24 /src/corelib/tools/qstring.cpp | |
| parent | b56dbaf5b3247bd8e87e4e856ad845593755c10c (diff) | |
| download | Qt-18943d3203a794f3f3173be6ec51c15db83db9e1.zip Qt-18943d3203a794f3f3173be6ec51c15db83db9e1.tar.gz Qt-18943d3203a794f3f3173be6ec51c15db83db9e1.tar.bz2 | |
omit unassigned (and too recent codepoints) from the text Normalization process
> handle any code points that were not defined in the earlier version
> as if they were unassigned: such code points will not decompose or compose,
> and their Canonical_Combining_Class value will be zero.
see http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability for details
we should respect that the QChar::Unicode_Unassigned == 0
and thus less than any other QChar::UnicodeVersion value
Merge-request: 952
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index f5efe55..934b6ad 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6367,7 +6367,7 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar:: if (mode == QString::NormalizationForm_D || mode == QString::NormalizationForm_KD) return; - composeHelper(data, from); + composeHelper(data, version, from); } |