summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkdiskcache.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-31 08:26:40 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-31 08:26:40 (GMT)
commit8a58bde27c9e23cd8a5688fdc50b6b74d25411a6 (patch)
tree28102e03233c45524aa75cbdbcb9287d6b8bc1f4 /src/network/access/qnetworkdiskcache.cpp
parent8529d7e3ace4994cd2caf563bb437f2c5c38bcee (diff)
parent624ea78d71dca5112272597f9f1ee165c2275c5c (diff)
downloadQt-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.zip
Qt-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.tar.gz
Qt-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.tar.bz2
Merge branch '4.5' into 4.6
Conflicts: tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
Diffstat (limited to 'src/network/access/qnetworkdiskcache.cpp')
-rw-r--r--src/network/access/qnetworkdiskcache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index f1a0098b..3ae6f01 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -482,7 +482,7 @@ void QNetworkDiskCache::setMaximumCacheSize(qint64 size)
Cleans the cache so that its size is under the maximum cache size.
Returns the current size of the cache.
- When the current size of the cache is greater then the maximumCacheSize()
+ When the current size of the cache is greater than the maximumCacheSize()
older cache files are removed until the total size is less then 90% of
maximumCacheSize() starting with the oldest ones first using the file
creation date to determine how old a cache file is.