summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@digia.com>2013-09-24 10:30:23 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-25 11:40:16 +0200
commit7c4fc9bfd2adef62d03c77fc5ca438164a5364dc (patch)
treed89eae1237dc95c301ffa0aff22a15b53a20ccc0
parentd5b591e828cb2de435907842dee371cfe2d13e48 (diff)
Remove usage of deprecated function qSort
Change-Id: Ic99f7627430546a44a5290f913a35b2ba6d664b5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/androiddeployqt/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 454ad317f..c67dfec40 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -54,6 +54,7 @@
#include <QStandardPaths>
#include <QUuid>
+#include <algorithm>
static const bool mustReadOutputAnyway = true; // pclose seems to return the wrong error code unless we read the output
void deleteRecursively(const QString &dirName)
@@ -429,7 +430,7 @@ QString detectLatestAndroidPlatform(const QString &sdkPath)
return QString();
}
- qSort(fileInfos.begin(), fileInfos.end(), quasiLexicographicalReverseLessThan);
+ std::sort(fileInfos.begin(), fileInfos.end(), quasiLexicographicalReverseLessThan);
QFileInfo latestPlatform = fileInfos.first();
return latestPlatform.baseName();