From a01b7dad50a526189f8f3abe6f48290458225f02 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Tue, 18 Feb 2014 09:33:36 +0100
Subject: Remove qSort usages from tests

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I4c48db80533802e37771d3967fa10bfb7000cb9a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 tests/auto/tools/rcc/tst_rcc.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests/auto/tools/rcc')

diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp
index 4089d53f3d..9a494428e7 100644
--- a/tests/auto/tools/rcc/tst_rcc.cpp
+++ b/tests/auto/tools/rcc/tst_rcc.cpp
@@ -54,6 +54,8 @@
 #include <QtCore/QLocale>
 #include <QtCore/QtGlobal>
 
+#include <algorithm>
+
 typedef QMap<QString, QString> QStringMap;
 Q_DECLARE_METATYPE(QStringMap)
 
@@ -325,8 +327,8 @@ void tst_rcc::binary()
     }
 
     // check that we have all (and only) the expected files
-    qSort(filesFound);
-    qSort(expectedFileNames);
+    std::sort(filesFound.begin(), filesFound.end());
+    std::sort(expectedFileNames.begin(), expectedFileNames.end());
     QCOMPARE(filesFound, expectedFileNames);
 
     // now actually check the file contents
-- 
cgit v1.2.3