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

Android: Use FilePath

Browse Source 
Change-Id: Ia1cf2a615f0de70038a575f851572e944a9797df
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Artem Sokolovskii
2021-09-15 15:16:56 +02:00
parent 905325358a
commit 2d22dbe612
5 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/android/androidconfigurations.cpp
View File

@@ -364,16 +364,21 @@ void AndroidConfig::parseDependenciesJson()
QVector<int> AndroidConfig::availableNdkPlatforms(const BaseQtVersion *qtVersion) const
{
QVector<int> availableNdkPlatforms;
QDirIterator it(ndkLocation(qtVersion).pathAppended("platforms").toString(),
QStringList("android-*"),
QDir::Dirs);
while (it.hasNext()) {
const QString &fileName = it.next();
availableNdkPlatforms.push_back(
fileName.mid(fileName.lastIndexOf(QLatin1Char('-')) + 1).toInt());
}
Utils::sort(availableNdkPlatforms, std::greater<>());
ndkLocation(qtVersion)
.pathAppended("platforms")
.iterateDirectory(
[&availableNdkPlatforms](const FilePath &filePath) {
availableNdkPlatforms.push_back(
filePath.toString()
.mid(filePath.path().lastIndexOf('-') + 1)
.toInt());
return true;
},
{"android-*"},
QDir::Dirs);
Utils::sort(availableNdkPlatforms, std::greater<>());
return availableNdkPlatforms;
}