summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-12-08 11:14:26 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-12-08 11:14:26 (GMT)
commitfc3f909c0cbbe15f2079edefe66ce52eb127a326 (patch)
treef101095c8a2ccf7f85cfa5b050022f81428f9800 /src/network/kernel
parentf71a7c4ef3c4c5a02730544d93200ef96d777aa0 (diff)
downloadQt-fc3f909c0cbbe15f2079edefe66ce52eb127a326.zip
Qt-fc3f909c0cbbe15f2079edefe66ce52eb127a326.tar.gz
Qt-fc3f909c0cbbe15f2079edefe66ce52eb127a326.tar.bz2
QSymbianSocketEngine: Always support IPv6
Diffstat (limited to 'src/network/kernel')
-rw-r--r--src/network/kernel/qnetworkproxy_symbian.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/network/kernel/qnetworkproxy_symbian.cpp b/src/network/kernel/qnetworkproxy_symbian.cpp
index 62266d1..7f53b4d 100644
--- a/src/network/kernel/qnetworkproxy_symbian.cpp
+++ b/src/network/kernel/qnetworkproxy_symbian.cpp
@@ -48,14 +48,17 @@ QT_BEGIN_NAMESPACE
QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &)
{
// TODO: Get the current QNetworkSession which has the Symbian RConnection we use
- // I am wondering if we already have a connected QNetworkSession when the code
- // is run that retrieves the proxy (for QNetworkAccessManager it's somewhere called
- // from createRequest() which might be too early...)
-
- // TODO: Get the proxy from that RConnection
+ // I am wondering if we already have a connected QNetworkSession when the code
+ // is run that retrieves the proxy (for QNetworkAccessManager it's somewhere called
+ // from createRequest() which might be too early...)
- // See http://bugreports.qt.nokia.com/browse/QTBUG-13857 and http://bugreports.qt.nokia.com/browse/QTBUG-11016
- // and the mails we have received.
+ // TODO: Get the proxy from that RConnection
+
+ // The QNetworkProxyQuery could have a QNetworkSession and then take the RConnection
+ // from there. If it does not have one, we have to use the "global RConnection".
+
+ // See http://bugreports.qt.nokia.com/browse/QTBUG-13857 and http://bugreports.qt.nokia.com/browse/QTBUG-11016
+ // and the mails we have received.
// Default case: No network proxy found/needed
return QList<QNetworkProxy>() << QNetworkProxy::NoProxy;