summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp')
-rw-r--r--tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp5
1 files changed, 4 insertions, 1 deletions
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;