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/qnetworkaccessbackend.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/qnetworkaccessbackend.cpp')
-rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 5aedac9..8f5a3da 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -46,7 +46,7 @@ #include "qnetworkreply_p.h" #include "QtCore/qhash.h" #include "QtCore/qmutex.h" -#include "QtNetwork/qnetworksession.h" +#include "QtNetwork/private/qnetworksession_p.h" #include "qnetworkaccesscachebackend_p.h" #include "qabstractnetworkcache.h" @@ -96,6 +96,11 @@ QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessM QNetworkAccessBackend *backend = (*it)->create(op, request); if (backend) { backend->manager = this; +#ifndef QT_NO_BEARERMANAGEMENT + //copy network session down to the backend + if (networkSession) + backend->setProperty("_q_networksession", QVariant::fromValue(networkSession)); +#endif return backend; // found a factory that handled our request } ++it; |