Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/testlib/qtestblacklist.cpp
	src/widgets/accessible/qaccessiblewidgets.cpp

Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c

1 files changed, 13 insertions, 1 deletions

diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index 3c3000da4d..5fa43948aa 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -522,9 +522,11 @@ enum {
     VietnameseCsbBit = 8,
     SimplifiedChineseCsbBit = 18,
     TraditionalChineseCsbBit = 20,
+    ThaiCsbBit = 16,
     JapaneseCsbBit = 17,
     KoreanCsbBit = 19,
-    KoreanJohabCsbBit = 21
+    KoreanJohabCsbBit = 21,
+    SymbolCsbBit = 31
 };
 
 /*!
@@ -579,6 +581,11 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q
         hasScript = true;
         //qDebug("font %s supports Arabic", familyName.latin1());
     }
+    if (codePageRange[0] & (1 << ThaiCsbBit)) {
+        writingSystems.setSupported(QFontDatabase::Thai);
+        hasScript = true;
+        //qDebug("font %s supports Thai", familyName.latin1());
+    }
     if (codePageRange[0] & (1 << VietnameseCsbBit)) {
         writingSystems.setSupported(QFontDatabase::Vietnamese);
         hasScript = true;
@@ -604,6 +611,11 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q
         hasScript = true;
         //qDebug("font %s supports Korean", familyName.latin1());
     }
+    if (codePageRange[0] & (1 << SymbolCsbBit)) {
+        writingSystems = QSupportedWritingSystems();
+        hasScript = false;
+    }
+
     if (!hasScript)
         writingSystems.setSupported(QFontDatabase::Symbol);