Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (198 commits)
  QNetworkCookie: do not access date string out of bounds
  Fix compile error with QT_NO_OPENSSL
  Fix qfile autotest hanging in CI system
  Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"
  QSslConfiguration: fix equals operator
  HTTP+SSL: use default SSL configuration, and avoid setting it explctly
  QLocale: Fixed double to currency string conversion on Mac.
  QNativeWifiEngine: Fix problem with wifi polling on Windows
  Applying the QTBUG-17986 fix to Symbian
  Added support for libICU for collation and toLower/toUpper.
  Fix regression with Qt::AutoConnection
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  Implement support for sockets started before the event loop
  QUdpSocket autotest updates
  tst_qnetworkreply: skip ioGetFromBuiltinHttp test.
  tst_qtcpserver: Add a mapped v4 addr test
  QHostInfo autotest fixes related to symbian
  QHostInfo symbian backend finalisation
  Add autotests for QHostInfo::abortHostLookup
  Updating comment in QHostInfo::localDomainName
  ...

1 files changed, 3 insertions, 1 deletions

diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 5aedac9..6220abe 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"
@@ -369,6 +369,8 @@ bool QNetworkAccessBackend::start()
 
     if (manager->networkSession->isOpen() &&
         manager->networkSession->state() == QNetworkSession::Connected) {
+        //copy network session down to the backend
+        setProperty("_q_networksession", QVariant::fromValue(manager->networkSession));
         open();
         return true;
     }