fix decomposition of certain characters

unorm2_getDecomposition() is supposedly independent of the UNormalizer2
instance according to its documentation, apparently not

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/tools/qchar.cpp b/src/core/tools/qchar.cpp
index 1cc1478..aeac441 100644 (file)
--- a/src/core/tools/qchar.cpp
+++ b/src/core/tools/qchar.cpp
@@ -1171,9 +1171,9 @@ QString QChar::decomposition() const
 QString QChar::decomposition(const uint ucs4)
 {
     UErrorCode errorcode = U_ZERO_ERROR;
-    const UNormalizer2 *normalizer = unorm2_getNFDInstance(&errorcode);
+    const UNormalizer2 *normalizer = unorm2_getNFKDInstance(&errorcode);
     if (Q_UNLIKELY(U_FAILURE(errorcode))) {
-        qWarning("QChar::decomposition: %s", u_errorName(errorcode));
+        qWarning("QChar::decomposition: unorm2_getNFKDInstance() failed %s", u_errorName(errorcode));
         return QString();
     }
 
@@ -1187,7 +1187,7 @@ QString QChar::decomposition(const uint ucs4)
     }
 
     if (Q_UNLIKELY(U_FAILURE(errorcode))) {
-        qWarning("QChar::decomposition: %s", u_errorName(errorcode));
+        qWarning("QChar::decomposition: unorm2_getDecomposition() failed %s", u_errorName(errorcode));
         return QString();
     }