Symbian socket: Implement systemProxyForQuery for service networks

When the specified (or active/default) network is a service network,
try to determine the appropriate IAP network within it.
This is the highest priority active network (if any)
followed by the highest priority discovered network (if any)
or the highest priority network as a last resort.

As Symbian doesn't include proxy type in the comms database, proxies
are assumed to be http type unless the port is 1080 (iana assigned
port for SOCKS) in which case the proxy is set as SOCKS type.

Also fixed unitialised member issue with SymbianIapId internal class

Task-number: QTBUG-18618
Reviewed-by: Markus Goetz

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 82a4193..b04556c 100644
--- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -146,6 +146,10 @@ void tst_QNetworkProxyFactory::systemProxyForQuery() const
 void tst_QNetworkProxyFactory::fromConfigurations()
 {
     QNetworkConfigurationManager manager;
+    //update is done to get the active / discovered states
+    manager.updateConfigurations();
+    connect(&manager, SIGNAL(updateCompleted()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
     QList<QNetworkProxy> proxies;
     QUrl url(QLatin1String("http://qt.nokia.com"));
     //get from known configurations
@@ -233,8 +237,6 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager()
     foreach (QNetworkProxy proxy, proxies) {
         qDebug() << formatProxyName(proxy);
     }
-    if (config.type() != QNetworkConfiguration::InternetAccessPoint)
-        QEXPECT_FAIL("","QNetworkProxyFactory::systemProxyForQuery doesn't work for service networks yet", Continue);
     QCOMPARE(factory->returnedList, proxies);
 }