summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnetworkdiskcache
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-04-01 14:58:26 +0200
committerPeter Hartmann <peter.hartmann@nokia.com>2011-04-01 16:02:17 +0200
commit151e48fef2a74a7d153a5a8eaff1088a4b1a9043 (patch)
tree4c23dcbe59d80d726761f1080646588855b41a61 /tests/auto/qnetworkdiskcache
parenta3b79f7449fc960da1b3ae39e0127c875c43b90f (diff)
QNetworkDiskCache: clean up after merge request
changes include whitespace, parenting, recovering erroneously deleted code etc. Reviewed-by: Markus Goetz
Diffstat (limited to 'tests/auto/qnetworkdiskcache')
-rw-r--r--tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 91b0164858..28c6027ec4 100644
--- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -181,6 +181,7 @@ void tst_QNetworkDiskCache::initTestCase()
dir.rmdir(s + "data7"); // the number is the internal cache version
dir.rmdir(s + "prepared");
dir.rmdir(s);
+ dir.rmdir(s + "http"); // delete directory used by 4.7 and earlier (would make the tests fail)
}
// This will be called after the last test function is executed.