1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp
index 007f6d597a..94072622eb 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp
@@ -179,14 +179,14 @@ void QWindowsFontEngine::getCMap()
     }
 }
 
-
+// ### Qt 5.1: replace with QStringIterator
 inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
+    uint uc = str[i].unicode();
+    if (QChar::isHighSurrogate(uc) && i < len-1) {
         uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
+        if (QChar::isLowSurrogate(low)) {
+            uc = QChar::surrogateToUcs4(uc, low);
             ++i;
         }
     }
@@ -402,7 +402,7 @@ void QWindowsFontEngine::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::Shape
                 if (!ttf) {
                     QChar ch[2] = { ushort(glyph), 0 };
                     int chrLen = 1;
-                    if (glyph > 0xffff) {
+                    if (QChar::requiresSurrogates(glyph)) {
                         ch[0] = QChar::highSurrogate(glyph);
                         ch[1] = QChar::lowSurrogate(glyph);
                         ++chrLen;