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

Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.

 Conflicts:
	qmake/generators/makefile.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
	tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
	tests/auto/gui/text/qglyphrun/BLACKLIST
	tests/auto/gui/text/qrawfont/BLACKLIST

Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9

1 files changed, 5 insertions, 6 deletions

diff --git a/tests/manual/textrendering/nativetext/main.cpp b/tests/manual/textrendering/nativetext/main.cpp
index 3fb78858f0..b481e44bae 100644
--- a/tests/manual/textrendering/nativetext/main.cpp
+++ b/tests/manual/textrendering/nativetext/main.cpp
@@ -101,7 +101,7 @@ public:
 
         const int ascent = fontMetrics().ascent();
 
-        QPen metricsPen(Qt::magenta, 1.0);
+        QPen metricsPen(QColor(112, 216, 255), 1.0);
         metricsPen.setCosmetic(true);
         p.setPen(metricsPen);
         p.drawLine(QPoint(0, ascent), QPoint(width(), ascent));
@@ -201,17 +201,16 @@ public:
                 case 0: return qMakePair(QColor(), QColor());
                 case 1: return qMakePair(QColor(Qt::black), QColor(Qt::white));
                 case 2: return qMakePair(QColor(Qt::white), QColor(Qt::black));
-                case 3: return qMakePair(QColor(Qt::green), QColor(Qt::red));
+                case 3: return qMakePair(QColor(Qt::magenta), QColor(Qt::green));
                 case 4: return qMakePair(QColor(0, 0, 0, 128), QColor(Qt::white));
                 case 5: return qMakePair(QColor(255, 255, 255, 128), QColor(Qt::black));
                 default: return qMakePair(QColor(), QColor());
                 }
             }();
 
-            layout->addWidget(new TextRenderer(12, text, color.first, color.second));
-            layout->addWidget(new TextRenderer(24, text, color.first, color.second));
-            layout->addWidget(new TextRenderer(36, text, color.first, color.second));
-            layout->addWidget(new TextRenderer(48, text, color.first, color.second));
+            for (int pointSize : {8, 12, 24, 36, 48})
+                layout->addWidget(new TextRenderer(pointSize, text, color.first, color.second));
+
             static_cast<QHBoxLayout*>(m_previews->layout())->addLayout(layout);
         }