summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-01 07:53:10 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-01 08:32:20 (GMT)
commit651f63172e4f68f8e084c16415499fdbda08bf39 (patch)
tree1a3ad131476d073310058800051985c36781722a
parent925912ebf552417306a5bd20fd986afda6a582be (diff)
downloadQt-651f63172e4f68f8e084c16415499fdbda08bf39.zip
Qt-651f63172e4f68f8e084c16415499fdbda08bf39.tar.gz
Qt-651f63172e4f68f8e084c16415499fdbda08bf39.tar.bz2
Re-add check for saving to cache, which was removed by accident.
Discussed with Ben Meyer.
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index c805d59..71e007f 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -283,6 +283,7 @@ void QNetworkReplyImplPrivate::createCache()
{
// check if we can save and if we're allowed to
if (!networkCache()
+ || !request.attribute(QNetworkRequest::CacheSaveControlAttribute, true).toBool()
|| request.attribute(QNetworkRequest::CacheLoadControlAttribute,
QNetworkRequest::PreferNetwork).toInt()
== QNetworkRequest::AlwaysNetwork)