diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-18 09:33:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 08:10:06 +0100 |
| commit | a01b7dad50a526189f8f3abe6f48290458225f02 (patch) | |
| tree | 5548cf044175aae69729a5d32888d2ca6466ca7b /tests/auto/tools/rcc | |
| parent | ac127a8c09ab91d15adb1cb9d44123f3e0185e00 (diff) | |
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>
Diffstat (limited to 'tests/auto/tools/rcc')
| -rw-r--r-- | tests/auto/tools/rcc/tst_rcc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 |