summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
-rw-r--r--src/plugins/android/androidmanager.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index bdd9e7b6e7..55914e9ace 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -50,6 +50,7 @@
#include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
+#include <utils/algorithm.h>
#include <QDir>
#include <QFileSystemWatcher>
@@ -868,7 +869,11 @@ QVector<AndroidManager::Library> AndroidManager::availableQtLibsWithDependencies
}
qtLibraries.push_back(library);
}
- qSort(qtLibraries.begin(), qtLibraries.end(), qtLibrariesLessThan);
+ Utils::sort(qtLibraries, [](const Library &a, const Library &b) -> bool {
+ if (a.level == b.level)
+ return a.name < b.name;
+ return a.level < b.level;
+ });
return qtLibraries;
@@ -1171,13 +1176,6 @@ int AndroidManager::setLibraryLevel(const QString &library, LibrariesMap &mapLib
return maxlevel + 1;
}
-bool AndroidManager::qtLibrariesLessThan(const Library &a, const Library &b)
-{
- if (a.level == b.level)
- return a.name < b.name;
- return a.level < b.level;
-}
-
QString AndroidManager::libGnuStl(const QString &arch, const QString &ndkToolChainVersion)
{
return AndroidConfigurations::currentConfig().ndkLocation().toString()