From 84fcc38955f16e6717f3183dd82eed5ddd76d27f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 20 Jul 2017 01:03:03 -0700
Subject: Autotest: when using libproxy, QNetworkProxyFactory isn't generic

Looks like whoever created the blacklist never tried to figure out why
it happened.

Change-Id: I84e45059a888497fb55ffffd14d2fb29e32a4521
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST              | 2 --
 .../auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro | 2 +-
 .../network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp  | 4 +++-
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST

(limited to 'tests/auto/network/kernel/qnetworkproxyfactory')

diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST b/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST
deleted file mode 100644
index 73570c98b7..0000000000
--- a/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[genericSystemProxy]
-ubuntu-14.04
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
index ed73e3e10e..a7fa43015f 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
@@ -4,6 +4,6 @@
 
 CONFIG += testcase
 TARGET = tst_qnetworkproxyfactory
-QT = core network testlib
+QT = core network-private testlib
 
 SOURCES += tst_qnetworkproxyfactory.cpp
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 4f947a5738..01566d795d 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -44,6 +44,8 @@
 #include <QSysInfo>
 #include <QThread>
 
+#include <private/qtnetworkglobal_p.h>
+
 class tst_QNetworkProxyFactory : public QObject {
     Q_OBJECT
 
@@ -367,7 +369,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy()
     QFETCH(int, port);
 
 // The generic system proxy is only available on the following platforms
-#if (!defined Q_OS_WIN) && (!defined Q_OS_OSX)
+#if (!defined Q_OS_WIN) && (!defined Q_OS_OSX) && !QT_CONFIG(libproxy)
     qputenv(envVar, url);
     const QList<QNetworkProxy> systemProxy = QNetworkProxyFactory::systemProxyForQuery();
     QCOMPARE(systemProxy.size(), 1);
-- 
cgit v1.2.3