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

Conflicts:
	src/corelib/io/qfilesystemengine_win.cpp
	src/gui/text/qdistancefield.cpp
	src/plugins/platforms/xcb/qxcbconnection.h

Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e

6 files changed, 23 insertions, 15 deletions

diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp
index 971b9b5fe7..c28812e120 100644
--- a/tests/auto/other/lancelot/paintcommands.cpp
+++ b/tests/auto/other/lancelot/paintcommands.cpp
@@ -263,7 +263,7 @@ void PaintCommands::staticInit()
                       "path_setFillRule pathName Winding");
     DECL_PAINTCOMMAND("setBrush", command_setBrush,
                       "^setBrush\\s+(#?[\\w.:\\/]*)\\s*(\\w*)?$",
-                      "setBrush <pixmapFileName>\nsetBrush noBrush\nsetBrush <color> <brush style enum>",
+                      "setBrush <imageFileName>\nsetBrush noBrush\nsetBrush <color> <brush style enum>",
                       "setBrush white SolidPattern");
     DECL_PAINTCOMMAND("setBrushOrigin", command_setBrushOrigin,
                       "^setBrushOrigin\\s*(-?\\w*)\\s+(-?\\w*)$",
@@ -1752,13 +1752,13 @@ void PaintCommands::command_setBrush(QRegExp re)
 {
     QStringList caps = re.capturedTexts();
 
-    QPixmap pm = image_load<QPixmap>(caps.at(1));
-    if (!pm.isNull()) { // Assume pixmap
+    QImage img = image_load<QImage>(caps.at(1));
+    if (!img.isNull()) { // Assume image brush
         if (m_verboseMode)
-            printf(" -(lance) setBrush(pixmap=%s, width=%d, height=%d)\n",
-                   qPrintable(caps.at(1)), pm.width(), pm.height());
+            printf(" -(lance) setBrush(image=%s, width=%d, height=%d)\n",
+                   qPrintable(caps.at(1)), img.width(), img.height());
 
-        m_painter->setBrush(QBrush(pm));
+        m_painter->setBrush(QBrush(img));
     } else if (caps.at(1).toLower() == "nobrush") {
         m_painter->setBrush(Qt::NoBrush);
         if (m_verboseMode)
diff --git a/tests/auto/other/lancelot/scripts/brushes.qps b/tests/auto/other/lancelot/scripts/brushes.qps
index 82cbff48b9..43a7843601 100644
--- a/tests/auto/other/lancelot/scripts/brushes.qps
+++ b/tests/auto/other/lancelot/scripts/brushes.qps
@@ -77,3 +77,12 @@ drawRect 0 250 50 50
 setBrushOrigin 50 250
 drawRect 50 250 50 50
 
+
+setBrush dome_indexed.png
+setPen nopen
+brushScale 0.7 0.7
+drawRect 20 320 600 200
+
+setBrush dome_argb32.png
+brushScale 1.5 1.5
+drawRect 20 540 600 200
diff --git a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
index b5db966bd9..e8970e6f24 100644
--- a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
@@ -284,6 +284,8 @@ void tst_MacNativeEvents::testMouseEnter()
 
 void tst_MacNativeEvents::testChildDialogInFrontOfModalParent()
 {
+    QSKIP("Modal dialog causes later tests to fail, see QTBUG-58474");
+
     // Test that a child dialog of a modal parent dialog is
     // in front of the parent, and active:
     QDialog parent;
diff --git a/tests/auto/other/networkselftest/tst_networkselftest.cpp b/tests/auto/other/networkselftest/tst_networkselftest.cpp
index 68473906b0..3b696604b5 100644
--- a/tests/auto/other/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/other/networkselftest/tst_networkselftest.cpp
@@ -961,7 +961,7 @@ void tst_NetworkSelfTest::supportsSsl()
 #endif
 }
 
-#ifndef QT_NO_PROCESS
+#if QT_CONFIG(process)
 static const QByteArray msgProcessError(const QProcess &process, const char *what)
 {
     QString result;
@@ -978,7 +978,7 @@ static void ensureTermination(QProcess &process)
             process.kill();
     }
 }
-#endif // !QT_NO_PROCESS
+#endif // QT_CONFIG(process)
 
 void tst_NetworkSelfTest::smbServer()
 {
@@ -996,7 +996,7 @@ void tst_NetworkSelfTest::smbServer()
     QCOMPARE(ret, strlen(contents));
     QVERIFY(memcmp(buf, contents, strlen(contents)) == 0);
 #else
-#ifndef QT_NO_PROCESS
+#if QT_CONFIG(process)
     enum { sambaTimeOutSecs = 5 };
     // try to use Samba
     const QString progname = "smbclient";
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index a12f08488d..0e84b187fa 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -56,6 +56,8 @@ cross_compile: SUBDIRS -= \
 
 !qtConfig(accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux
 
+!qtConfig(process): SUBDIRS -= qprocess_and_guieventloop
+
 !mac: SUBDIRS -= \
            macgui \
            macnativeevents \
@@ -65,8 +67,5 @@ cross_compile: SUBDIRS -= \
 !embedded: SUBDIRS -= \
            qdirectpainter
 
-winrt: SUBDIRS -= \
-   qprocess_and_guieventloop
-
 android: SUBDIRS += \
     android
diff --git a/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp b/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
index 1fcb77c51b..5842d58fab 100644
--- a/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
+++ b/tests/auto/other/qprocess_and_guieventloop/tst_qprocess_and_guieventloop.cpp
@@ -40,9 +40,7 @@ private slots:
 
 void tst_QProcess_and_GuiEventLoop::waitForAndEventLoop()
 {
-#if defined(QT_NO_PROCESS)
-    QSKIP("QProcess not supported");
-#elif defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID)
     QSKIP("Not supported on Android");
 #else