Merge branch '4.5' into 4.6

Conflicts:
	src/network/access/qnetworkaccessbackend.cpp
	src/network/access/qnetworkreplyimpl.cpp
	tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp

1 files changed, 21 insertions, 15 deletions

diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 3b0948b..a60a8dd 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 inline QNetworkReplyImplPrivate::QNetworkReplyImplPrivate()
     : backend(0), outgoingData(0), outgoingDataBuffer(0),
-      copyDevice(0), networkCache(0),
+      copyDevice(0),
       cacheEnabled(false), cacheSaveDevice(0),
       notificationHandlingPaused(false),
       bytesDownloaded(0), lastBytesDownloaded(-1), bytesUploaded(-1),
@@ -252,11 +252,6 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
     q->QIODevice::open(QIODevice::ReadOnly);
 }
 
-void QNetworkReplyImplPrivate::setNetworkCache(QAbstractNetworkCache *nc)
-{
-    networkCache = nc;
-}
-
 void QNetworkReplyImplPrivate::backendNotify(InternalNotifications notification)
 {
     Q_Q(QNetworkReplyImpl);
@@ -318,17 +313,28 @@ void QNetworkReplyImplPrivate::resumeNotificationHandling()
         QCoreApplication::postEvent(q, new QEvent(QEvent::NetworkReplyUpdated));
 }
 
+QAbstractNetworkCache *QNetworkReplyImplPrivate::networkCache() const
+{
+    if (!backend)
+        return 0;
+    return backend->networkCache();
+}
+
 void QNetworkReplyImplPrivate::createCache()
 {
     // check if we can save and if we're allowed to
-    if (!networkCache || !request.attribute(QNetworkRequest::CacheSaveControlAttribute, true).toBool())
+    if (!networkCache()
+        || !request.attribute(QNetworkRequest::CacheSaveControlAttribute, true).toBool()
+        || request.attribute(QNetworkRequest::CacheLoadControlAttribute,
+                             QNetworkRequest::PreferNetwork).toInt()
+            == QNetworkRequest::AlwaysNetwork)
         return;
     cacheEnabled = true;
 }
 
 bool QNetworkReplyImplPrivate::isCachingEnabled() const
 {
-    return (cacheEnabled && networkCache != 0);
+    return (cacheEnabled && networkCache() != 0);
 }
 
 void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
@@ -352,7 +358,7 @@ void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
         qDebug("QNetworkReplyImpl: setCachingEnabled(true) called after setCachingEnabled(false) -- "
                "backend %s probably needs to be fixed",
                backend->metaObject()->className());
-        networkCache->remove(url);
+        networkCache()->remove(url);
         cacheSaveDevice = 0;
         cacheEnabled = false;
     }
@@ -361,9 +367,9 @@ void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
 void QNetworkReplyImplPrivate::completeCacheSave()
 {
     if (cacheEnabled && errorCode != QNetworkReplyImpl::NoError) {
-        networkCache->remove(url);
+        networkCache()->remove(url);
     } else if (cacheEnabled && cacheSaveDevice) {
-        networkCache->insert(cacheSaveDevice);
+        networkCache()->insert(cacheSaveDevice);
     }
     cacheSaveDevice = 0;
     cacheEnabled = false;
@@ -410,15 +416,15 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data)
             metaData.setAttributes(attributes);
         }
 
-        cacheSaveDevice = networkCache->prepare(metaData);
+        cacheSaveDevice = networkCache()->prepare(metaData);
 
         if (!cacheSaveDevice || (cacheSaveDevice && !cacheSaveDevice->isOpen())) {
             if (cacheSaveDevice && !cacheSaveDevice->isOpen())
                 qCritical("QNetworkReplyImpl: network cache returned a device that is not open -- "
                       "class %s probably needs to be fixed",
-                      networkCache->metaObject()->className());
+                      networkCache()->metaObject()->className());
 
-            networkCache->remove(url);
+            networkCache()->remove(url);
             cacheSaveDevice = 0;
             cacheEnabled = false;
         }
@@ -566,7 +572,7 @@ QNetworkReplyImpl::~QNetworkReplyImpl()
 {
     Q_D(QNetworkReplyImpl);
     if (d->isCachingEnabled())
-        d->networkCache->remove(url());
+        d->networkCache()->remove(url());
 }
 
 void QNetworkReplyImpl::abort()