From 33ba2e7e61b35c3cd9d377ae8a43a755c3b38a51 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 13 Jan 2011 13:43:56 +0100 Subject: Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static The test failed to build because QNetworkProxyFactory can't be instantiated (pure virtual member queryProxy()), but doing so isn't necessary. The test has also been removed from the network tests because it relies on a static configuration, but can not guarantee that the configuration exists. (cherry picked from commit 4d0cd05e98c3e83a4d1871c139cd8b4a2a86e988) --- tests/auto/network.pro | 1 - tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro | 2 +- tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory_symbian.cpp | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/auto/network.pro b/tests/auto/network.pro index 2e3b5cd..31c754c 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -25,7 +25,6 @@ SUBDIRS=\ qnetworkcookiejar \ qnetworkinterface \ qnetworkproxy \ - qnetworkproxyfactory \ qnetworkrequest \ qnetworksession \ qobjectperformance \ diff --git a/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro index 81460a1..369b5fa 100644 --- a/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro +++ b/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro @@ -5,7 +5,7 @@ load(qttest_p4) QT = core network -SOURCES += tst_qnetworkproxyfactory_symbian.cpp +symbian: SOURCES += tst_qnetworkproxyfactory_symbian.cpp symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory_symbian.cpp b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory_symbian.cpp index 6a8ea79..31521c3 100644 --- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory_symbian.cpp +++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory_symbian.cpp @@ -68,9 +68,8 @@ QString tst_QNetworkProxyFactory_symbian::formatProxyName(const QNetworkProxy & void tst_QNetworkProxyFactory_symbian::systemProxyForQuery() const { - QNetworkProxyFactory proxyFactory; QNetworkProxyQuery query(QUrl(QString("http://www.abc.com")), QNetworkProxyQuery::UrlRequest); - QList systemProxyList = proxyFactory.systemProxyForQuery(query); + QList systemProxyList = QNetworkProxyFactory::systemProxyForQuery(query); bool pass = true; QNetworkProxy proxy; -- cgit v0.12