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

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/widgets/util/util.pri
	tests/auto/corelib/thread/qthread/qthread.pro
	tests/auto/corelib/thread/qthread/tst_qthread.cpp

Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b

2 files changed, 10 insertions, 21 deletions

diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
index 715fc586cd..d72e92b859 100644
--- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
+++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
@@ -32,16 +32,7 @@
 #include <QtNetwork/QDnsLookup>
 #include <QtNetwork/QHostAddress>
 
-static bool waitForDone(QDnsLookup *lookup)
-{
-    if (lookup->isFinished())
-        return true;
-
-    QObject::connect(lookup, SIGNAL(finished()),
-                     &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(10);
-    return !QTestEventLoop::instance().timeout();
-}
+static const int Timeout = 15000; // 15s
 
 class tst_QDnsLookup: public QObject
 {
@@ -231,8 +222,7 @@ void tst_QDnsLookup::lookup()
     lookup.setType(static_cast<QDnsLookup::Type>(type));
     lookup.setName(domain);
     lookup.lookup();
-    QVERIFY(waitForDone(&lookup));
-    QVERIFY(lookup.isFinished());
+    QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout);
 
 #if defined(Q_OS_ANDROID)
     if (lookup.errorString() == QStringLiteral("Not yet supported on Android"))
@@ -331,8 +321,7 @@ void tst_QDnsLookup::lookupReuse()
     lookup.setType(QDnsLookup::A);
     lookup.setName(domainName("a-single"));
     lookup.lookup();
-    QVERIFY(waitForDone(&lookup));
-    QVERIFY(lookup.isFinished());
+    QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout);
 
 #if defined(Q_OS_ANDROID)
     if (lookup.errorString() == QStringLiteral("Not yet supported on Android"))
@@ -348,8 +337,7 @@ void tst_QDnsLookup::lookupReuse()
     lookup.setType(QDnsLookup::AAAA);
     lookup.setName(domainName("aaaa-single"));
     lookup.lookup();
-    QVERIFY(waitForDone(&lookup));
-    QVERIFY(lookup.isFinished());
+    QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout);
     QCOMPARE(int(lookup.error()), int(QDnsLookup::NoError));
     QVERIFY(!lookup.hostAddressRecords().isEmpty());
     QCOMPARE(lookup.hostAddressRecords().first().name(), domainName("aaaa-single"));
@@ -366,8 +354,7 @@ void tst_QDnsLookup::lookupAbortRetry()
     lookup.setName(domainName("a-single"));
     lookup.lookup();
     lookup.abort();
-    QVERIFY(waitForDone(&lookup));
-    QVERIFY(lookup.isFinished());
+    QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout);
     QCOMPARE(int(lookup.error()), int(QDnsLookup::OperationCancelledError));
     QVERIFY(lookup.hostAddressRecords().isEmpty());
 
@@ -375,8 +362,7 @@ void tst_QDnsLookup::lookupAbortRetry()
     lookup.setType(QDnsLookup::AAAA);
     lookup.setName(domainName("aaaa-single"));
     lookup.lookup();
-    QVERIFY(waitForDone(&lookup));
-    QVERIFY(lookup.isFinished());
+    QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout);
 
 #if defined(Q_OS_ANDROID)
     if (lookup.errorString() == QStringLiteral("Not yet supported on Android"))
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 7faf0d947c..4f947a5738 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -41,7 +41,7 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QList>
-
+#include <QSysInfo>
 #include <QThread>
 
 class tst_QNetworkProxyFactory : public QObject {
@@ -416,6 +416,9 @@ public:
 //regression test for QTBUG-18799
 void tst_QNetworkProxyFactory::systemProxyForQueryCalledFromThread()
 {
+    if (QSysInfo::productType() == QLatin1String("windows") && QSysInfo::productVersion() == QLatin1String("7sp1")) {
+        QSKIP("This test fails by the systemProxyForQuery() call hanging - QTQAINFRA-1200");
+    }
     QUrl url(QLatin1String("http://qt-project.org"));
     QNetworkProxyQuery query(url);
     QSPFQThread thread;