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

 Conflicts:
	configure.pri

Also required s/solid\.color/solidColor/ in a couple of places in:
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I29937f63e9779deb6dac7ae77e2948d06ebc0319

2 files changed, 29 insertions, 11 deletions

diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 2d64714f92..10b09629bc 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -164,9 +164,8 @@ private slots:
     void waitForReadyReadInASlot();
     void remoteCloseError();
     void nestedEventLoopInErrorSlot();
-#ifndef Q_OS_WIN
-    void connectToLocalHostNoService();
-#endif
+    void connectToHostError_data();
+    void connectToHostError();
     void waitForConnectedInHostLookupSlot();
     void waitForConnectedInHostLookupSlot2();
     void readyReadSignalsAfterWaitForReadyRead();
@@ -2040,18 +2039,38 @@ void tst_QTcpSocket::nestedEventLoopInErrorSlot()
 }
 
 //----------------------------------------------------------------------------------
-#ifndef Q_OS_WIN
-void tst_QTcpSocket::connectToLocalHostNoService()
+
+void tst_QTcpSocket::connectToHostError_data()
+{
+    QTest::addColumn<QString>("host");
+    QTest::addColumn<int>("port");
+    QTest::addColumn<QAbstractSocket::SocketError>("expectedError");
+
+    QTest::newRow("localhost no service") << QStringLiteral("localhost") << 31415 << QAbstractSocket::ConnectionRefusedError;
+    QTest::newRow("unreachable") << QStringLiteral("0.0.0.1") << 65000 << QAbstractSocket::NetworkError;
+}
+
+
+void tst_QTcpSocket::connectToHostError()
 {
-    // This test was created after we received a report that claimed
-    // QTcpSocket would crash if trying to connect to "localhost" on a random
-    // port with no service listening.
     QTcpSocket *socket = newSocket();
-    socket->connectToHost("localhost", 31415); // no service running here, one suspects
+
+    QAbstractSocket::SocketError error = QAbstractSocket::UnknownSocketError;
+
+    QFETCH(QString, host);
+    QFETCH(int, port);
+    QFETCH(QAbstractSocket::SocketError, expectedError);
+
+    connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),[&](QAbstractSocket::SocketError socketError){
+        error = socketError;
+    });
+    socket->connectToHost(host, port); // no service running here, one suspects
     QTRY_COMPARE(socket->state(), QTcpSocket::UnconnectedState);
+    if (error != expectedError && error == QAbstractSocket::ConnectionRefusedError)
+        QEXPECT_FAIL("unreachable", "CI firewall interfers with this test", Continue);
+    QCOMPARE(error, expectedError);
     delete socket;
 }
-#endif
 
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::waitForConnectedInHostLookupSlot()
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 1a9cab3e24..66475e55ad 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -2711,7 +2711,6 @@ void tst_QSslSocket::encryptWithoutConnecting()
 
 void tst_QSslSocket::resume_data()
 {
-    QSKIP("Temporary skip while updating certificates");
     QTest::addColumn<bool>("ignoreErrorsAfterPause");
     QTest::addColumn<QList<QSslError> >("errorsToIgnore");
     QTest::addColumn<bool>("expectSuccess");