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

Android: Factor out removal of ndk packages from list

Browse Source 
Will be used in additional places, soon.

Change-Id: Iceff0d14175f0bc9132d697d82ac46049a84ec17
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2023-01-17 18:31:46 +01:00
parent e2eab57a28
commit 64b5364cab
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -922,6 +922,12 @@ QStringList AndroidConfig::allEssentials() const
return allPackages; return allPackages;
} }
static QStringList packagesWithoutNdks(const QStringList &packages)
{
return Utils::filtered(packages, [] (const QString &p) {
return !p.startsWith(ndkPackageMarker()); });
}
bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager)
{ {
QStringList essentialPkgs(allEssentials()); QStringList essentialPkgs(allEssentials());
@@ -933,8 +939,7 @@ bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager)
break; break;
} }
if (!m_defaultNdk.isEmpty()) if (!m_defaultNdk.isEmpty())
essentialPkgs = Utils::filtered(essentialPkgs, [] (const QString &p) { essentialPkgs = packagesWithoutNdks(essentialPkgs);
return !p.startsWith(ndkPackageMarker()); });
return essentialPkgs.isEmpty() ? true : false; return essentialPkgs.isEmpty() ? true : false;
} }