diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-03-08 18:17:25 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-03-08 18:17:25 (GMT) |
| commit | 1500707a35ec95571d3dc1573e54d44420ee9098 (patch) | |
| tree | 32f4ef849e899c8ae54472c0b9842229e3b42056 /src/network/access/qhttpnetworkconnectionchannel.cpp | |
| parent | b6cc353adb0613ce41153181b4f08bb81b7acf68 (diff) | |
| parent | 45531aceba4d0b2114942c49f4c256b70af58cf8 (diff) | |
| download | Qt-1500707a35ec95571d3dc1573e54d44420ee9098.zip Qt-1500707a35ec95571d3dc1573e54d44420ee9098.tar.gz Qt-1500707a35ec95571d3dc1573e54d44420ee9098.tar.bz2 | |
Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 60094b0..2292a7f 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -54,6 +54,10 @@ # include <QtNetwork/qsslconfiguration.h> #endif +#ifndef QT_NO_BEARERMANAGEMENT +#include "private/qnetworksession_p.h" +#endif + QT_BEGIN_NAMESPACE // TODO: Put channel specific stuff here so it does not polute qhttpnetworkconnection.cpp @@ -91,6 +95,11 @@ void QHttpNetworkConnectionChannel::init() #else socket = new QTcpSocket; #endif +#ifndef QT_NO_BEARERMANAGEMENT + //push session down to socket + if (networkSession) + socket->setProperty("_q_networksession", QVariant::fromValue(networkSession)); +#endif // Set by QNAM anyway, but let's be safe here socket->setProxy(QNetworkProxy::NoProxy); |