summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/qnetworkdiskcache
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-02-17 16:56:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-17 19:31:01 +0100
commit817c4be91fc9bfa35112fbae689747d42d121036 (patch)
treea9b4cd1d510a7cae2e0a8314b7c2ae0b2e0b7f0e /tests/auto/network/access/qnetworkdiskcache
parentce46593e25d023b756128d53f5c7b4a7ee52f488 (diff)
Remove qSort usages from network tests
QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I31a701d8e17673edcb9bb7c32e6e6a87812a7fbc Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'tests/auto/network/access/qnetworkdiskcache')
-rw-r--r--tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 54b560cc1b..44edcc66c0 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -43,6 +43,9 @@
#include <QtTest/QtTest>
#include <QtNetwork/QtNetwork>
#include <qnetworkdiskcache.h>
+
+#include <algorithm>
+
#define EXAMPLE_URL "http://user:pass@www.example.com/#foo"
//cached objects are organized into these many subdirs
#define NUM_SUBDIRECTORIES 16
@@ -464,7 +467,7 @@ void tst_QNetworkDiskCache::expire()
cacheList.append(metaData.url().toString());
}
}
- qSort(cacheList);
+ std::sort(cacheList.begin(), cacheList.end());
for (int i = 0; i < cacheList.count(); ++i) {
QString fileName = cacheList[i];
QCOMPARE(fileName, QString("http://www.foo.com/%1").arg(i + 6));