summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworkproxyfactory
diff options
context:
space:
mode:
authorJeremy Katz <jeremy.katz@nokia.com>2011-01-13 13:43:56 +0100
committerJeremy Katz <jeremy.katz@nokia.com>2011-01-13 15:49:34 +0100
commit4d0cd05e98c3e83a4d1871c139cd8b4a2a86e988 (patch)
treeb4ba68abce4ce7c337a212d0728bc38fdeabafa3 /tests/auto/qnetworkproxyfactory
parent4ca0bb3c50a47e991a1304e5d404387da05266a4 (diff)
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.
Diffstat (limited to 'tests/auto/qnetworkproxyfactory')
-rw-r--r--tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro2
-rw-r--r--tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory_symbian.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro
index 81460a1e70..369b5fa260 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 6a8ea798be..31521c36d1 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<QNetworkProxy> systemProxyList = proxyFactory.systemProxyForQuery(query);
+ QList<QNetworkProxy> systemProxyList = QNetworkProxyFactory::systemProxyForQuery(query);
bool pass = true;
QNetworkProxy proxy;