summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-04-16 12:52:52 +0300
committerQt by Nokia <qt-info@nokia.com>2012-04-17 18:44:13 +0200
commit95bd974163d9103634a5ce4cbfc9bc3c4827dee1 (patch)
tree227815cf3d1d0ecbe908d0f63f0ea6e0fcfc594a /src/corelib/tools
parent087cda285f8a743427fa40d12e354e9ab7d1d84e (diff)
fix QChar::decompositionTag() returns wrong result for Hangul syllables
Change-Id: I28e7b14b6a90aa539f8a50107737a66b3484fc00 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qchar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index 80233b430a..e3d6c60b0f 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -981,6 +981,8 @@ QChar::Decomposition QChar::decompositionTag(uint ucs4)
{
if (ucs4 > UNICODE_LAST_CODEPOINT)
return QChar::NoDecomposition;
+ if (ucs4 >= Hangul_SBase && ucs4 < Hangul_SBase + Hangul_SCount)
+ return QChar::Canonical;
const unsigned short index = GET_DECOMPOSITION_INDEX(ucs4);
if (index == 0xffff)
return QChar::NoDecomposition;