diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-12 11:06:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 01:10:37 +0200 |
| commit | 4df73e62a70b73d955ab53faef4615ea03a21a4d (patch) | |
| tree | 00acf9163a0447da03298659bc47d2de9da509f7 /tests/manual | |
| parent | c1821de0e6ef21f86623572fd54f5cc5451b6077 (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/manual')
| -rw-r--r-- | tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp index 74845ab954..cb0f44a03e 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp +++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp @@ -47,6 +47,7 @@ #include <QtCore/QProcess> #include <QtGui/QImage> +#include <algorithm> QString blockify(const QByteArray& s) { @@ -167,7 +168,7 @@ void tst_Scenegraph::setupTestSuite(const QByteArray& filter) } } - qSort(itemFiles); + std::sort(itemFiles.begin(), itemFiles.end()); foreach (const QString &filePath, itemFiles) { QByteArray itemName = filePath.mid(testSuitePath.length() + 1).toLatin1(); QBaselineTest::newRow(itemName, checksumFileOrDir(filePath)) << filePath; |