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

 Conflicts:
	src/gui/kernel/qwindow.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
	tests/auto/widgets/kernel/qaction/tst_qaction.cpp

Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233

1 files changed, 54 insertions, 1 deletions

diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index b6b5f5ae70..5baf4c0870 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -1994,6 +1994,16 @@ void tst_QNetworkReply::getErrors_data()
                                          << int(QNetworkReply::AuthenticationRequiredError) << 401 << false;
 }
 
+static QByteArray msgGetErrors(int waitResult, const QNetworkReplyPtr &reply)
+{
+    QByteArray result ="waitResult=" + QByteArray::number(waitResult);
+    if (reply->isFinished())
+        result += ", finished";
+    if (reply->error() != QNetworkReply::NoError)
+        result += ", error: " + QByteArray::number(int(reply->error()));
+    return result;
+}
+
 void tst_QNetworkReply::getErrors()
 {
     QFETCH(QString, url);
@@ -2023,7 +2033,8 @@ void tst_QNetworkReply::getErrors()
         QCOMPARE(reply->error(), QNetworkReply::NoError);
 
     // now run the request:
-    QVERIFY(waitForFinish(reply) != Timeout);
+    const int waitResult = waitForFinish(reply);
+    QVERIFY2(waitResult != Timeout, msgGetErrors(waitResult, reply));
 
     QFETCH(int, error);
     QEXPECT_FAIL("ftp-is-dir", "QFtp cannot provide enough detail", Abort);
@@ -6755,6 +6766,48 @@ void tst_QNetworkReply::getFromUnreachableIp()
 {
     QNetworkAccessManager manager;
 
+#ifdef Q_OS_WIN32
+    // This test assumes that attempt to connect to 255.255.255.255 fails more
+    // or less fast/immediately. This is not what we observe on Windows x86:
+    // WSAConnect on non-blocking socket returns SOCKET_ERROR, WSAGetLastError
+    // returns WSAEWOULDBLOCK (expected) and getsockopt most of the time returns
+    // NOERROR; so socket engine starts a timer (30 s.) and waits for a timeout/
+    // error/success. Unfortunately, the test itself is waiting only for 5 s.
+    // So we have to adjust the connection timeout or skip the test completely
+    // if the 'bearermanagement' feature is not available.
+#if QT_CONFIG(bearermanagement)
+    class ConfigurationGuard
+    {
+    public:
+        explicit ConfigurationGuard(QNetworkAccessManager *m)
+            : manager(m)
+        {
+            Q_ASSERT(m);
+            auto conf = manager->configuration();
+            previousTimeout = conf.connectTimeout();
+            conf.setConnectTimeout(1500);
+            manager->setConfiguration(conf);
+        }
+        ~ConfigurationGuard()
+        {
+            Q_ASSERT(manager);
+            auto conf = manager->configuration();
+            conf.setConnectTimeout(previousTimeout);
+            manager->setConfiguration(conf);
+        }
+    private:
+        QNetworkAccessManager *manager = nullptr;
+        int previousTimeout = 0;
+
+        Q_DISABLE_COPY(ConfigurationGuard)
+    };
+
+    const ConfigurationGuard restorer(&manager);
+#else // bearermanagement
+    QSKIP("This test is non-deterministic on Windows x86");
+#endif // !bearermanagement
+#endif // Q_OS_WIN32
+
     QNetworkRequest request(QUrl("http://255.255.255.255/42/23/narf/narf/narf"));
     QNetworkReplyPtr reply(manager.get(request));