feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Reinvent deprecated qSort as Utils::sort

Browse Source 
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Nikita Baryshnikov
2014-06-16 18:25:52 +04:00
committed by hjk
parent eefd0f4332
commit 12103e0f67
75 changed files with 275 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidmanager.cpp
View File

@@ -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()