summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-04-15 00:52:24 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-04-15 00:52:24 (GMT)
commit83cdc9150311e30d8a77e69f7546b88e1eb1bdc3 (patch)
tree5270d085b55ab6994f107e4865e06b3c3d63f0e9 /src/network
parent014af3e99616f9ee13ca365566828f7daf77a7f6 (diff)
parentbb7bddc47dd0748b45d22180d9e3c8e5209010b3 (diff)
downloadQt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.zip
Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.tar.gz
Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qnetworkdiskcache.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index fa0fccb..93360c8 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -253,7 +253,8 @@ void QNetworkDiskCachePrivate::storeItem(QCacheItem *cacheItem)
// ### use atomic rename rather then remove & rename
if (cacheItem->file->rename(fileName))
currentCacheSize += cacheItem->file->size();
- cacheItem->file->setAutoRemove(true);
+ else
+ cacheItem->file->setAutoRemove(true);
}
if (cacheItem->metaData.url() == lastItem.metaData.url())
lastItem.reset();