aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmldirparser
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2013-09-12 11:06:59 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-13 01:10:37 +0200
commit4df73e62a70b73d955ab53faef4615ea03a21a4d (patch)
tree00acf9163a0447da03298659bc47d2de9da509f7 /tests/auto/qml/qqmldirparser
parentc1821de0e6ef21f86623572fd54f5cc5451b6077 (diff)
Remove qSort usages from declarative
QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmldirparser')
-rw-r--r--tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
index bf76c07970..634a6e5df1 100644
--- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
+++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp
@@ -48,6 +48,8 @@
#include <private/qqmldirparser_p.h>
#include <QDebug>
+#include <algorithm>
+
// Test the parsing of qmldir files
class tst_qqmldirparser : public QQmlDataTest
@@ -104,7 +106,7 @@ namespace {
foreach (const QQmlDirParser::Component &c, components.values())
rv.append(toString(c));
- qSort(rv);
+ std::sort(rv.begin(), rv.end());
return rv;
}