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

Conflicts:
	config_help.txt
	configure
	src/corelib/io/qprocess_wince.cpp
	src/plugins/platforms/windows/qwindowstheme.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qtimezone/BLACKLIST
	tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01

1 files changed, 10 insertions, 20 deletions

diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index de29389796..36907b9258 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -1075,8 +1075,6 @@ void tst_QTextScriptEngine::mirroredChars()
 
 void tst_QTextScriptEngine::controlInSyllable_qtbug14204()
 {
-    QSKIP("Result differs for HarfBuzz-NG, skip test.");
-
     QFontDatabase db;
     if (!db.families().contains(QStringLiteral("Aparajita")))
         QSKIP("couldn't find 'Aparajita' font");
@@ -1101,13 +1099,13 @@ void tst_QTextScriptEngine::controlInSyllable_qtbug14204()
     QCOMPARE(fe->fontDef.family, font.family());
 
     e->shape(0);
-    QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(2));
+    QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(3));
 
     const ushort *log_clusters = e->logClusters(&e->layoutData->items[0]);
     QCOMPARE(log_clusters[0], ushort(0));
     QCOMPARE(log_clusters[1], ushort(0));
-    QCOMPARE(log_clusters[2], ushort(0));
-    QCOMPARE(log_clusters[3], ushort(0));
+    QCOMPARE(log_clusters[2], ushort(1));
+    QCOMPARE(log_clusters[3], ushort(2));
 }
 
 void tst_QTextScriptEngine::combiningMarks_qtbug15675_data()
@@ -1225,29 +1223,21 @@ void tst_QTextScriptEngine::thaiWithZWJ()
     QTextLayout layout(s, font);
     QTextEngine *e = layout.engine();
     e->itemize();
-    QCOMPARE(e->layoutData->items.size(), 11);
+    QCOMPARE(e->layoutData->items.size(), 3);
 
     for (int item = 0; item < e->layoutData->items.size(); ++item)
         e->shape(item);
 
-    QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(7));  // Thai: The ZWJ and ZWNJ characters are inherited, so should be part of the thai script
-    QCOMPARE(e->layoutData->items[1].num_glyphs, ushort(1));  // Common: The smart quotes cannot be handled by thai, so should be a separate item
-    QCOMPARE(e->layoutData->items[2].num_glyphs, ushort(1));  // Thai: Thai character
-    QCOMPARE(e->layoutData->items[3].num_glyphs, ushort(1));  // Common: Ellipsis
-    QCOMPARE(e->layoutData->items[4].num_glyphs, ushort(1));  // Thai: Thai character
-    QCOMPARE(e->layoutData->items[5].num_glyphs, ushort(1));  // Common: Smart quote
-    QCOMPARE(e->layoutData->items[6].num_glyphs, ushort(1));  // Thai: Thai character
-    QCOMPARE(e->layoutData->items[7].num_glyphs, ushort(1));  // Common: \xA0 = non-breaking space. Could be useful to have in thai, but not currently implemented
-    QCOMPARE(e->layoutData->items[8].num_glyphs, ushort(1));  // Thai: Thai character
-    QCOMPARE(e->layoutData->items[9].num_glyphs, ushort(1));  // Japanese: Kanji for tree
-    QCOMPARE(e->layoutData->items[10].num_glyphs, ushort(2)); // Thai: Thai character followed by superscript "a" which is of inherited type
+    QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(15));  // Thai, Inherited and Common
+    QCOMPARE(e->layoutData->items[1].num_glyphs, ushort(1));  // Japanese: Kanji for tree
+    QCOMPARE(e->layoutData->items[2].num_glyphs, ushort(2)); // Thai: Thai character followed by superscript "a" which is of inherited type
 
     //A quick sanity check - check all the characters are individual clusters
     unsigned short *logClusters = e->layoutData->logClustersPtr;
-    for (int i = 0; i < 7; i++)
+    for (int i = 0; i < 15; i++)
         QCOMPARE(logClusters[i], ushort(i));
-    for (int i = 0; i < 10; i++)
-        QCOMPARE(logClusters[i+7], ushort(0));
+    for (int i = 0; i < 3; i++)
+        QCOMPARE(logClusters[i+15], ushort(0));
 
     // A thai implementation could either remove the ZWJ and ZWNJ characters, or hide them.
     // The current implementation hides them, so we test for that.