Merge remote branch 'origin/4.8' into 4.8-from-4.7

Conflicts:
	src/gui/text/qtextengine_p.h
	src/network/ssl/qsslsocket_openssl.cpp

1 files changed, 9 insertions, 11 deletions

diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index 36eb7c0..203b6e1 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -108,7 +108,8 @@ QByteArray QSymbianTypeFaceExtras::getSfntTable(uint tag) const
         Q_ASSERT(m_trueTypeExtension->HasTrueTypeTable(tag));
         TInt error = KErrNone;
         TInt tableByteLength = 0;
-        TAny *table = q_check_ptr(m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength));
+        TAny *table = m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength);
+        Q_CHECK_PTR(table);
         const QByteArray result(static_cast<const char*>(table), tableByteLength);
         m_trueTypeExtension->ReleaseTrueTypeTable(table);
         return result;
@@ -138,8 +139,8 @@ bool QSymbianTypeFaceExtras::getSfntTableData(uint tag, uchar *buffer, uint *len
 
         TInt error = KErrNone;
         TInt tableByteLength;
-        TAny *table =
-                q_check_ptr(m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength));
+        TAny *table = m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength);
+        Q_CHECK_PTR(table);
 
         if (error != KErrNone) {
             return false;
@@ -232,15 +233,12 @@ bool QSymbianTypeFaceExtras::symbianFontTableApiAvailable()
 // duplicated from qfontengine_xyz.cpp
 static 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 low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 extern QString qt_symbian_fontNameWithAppFontMarker(const QString &fontName); // qfontdatabase_s60.cpp