diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 6239a0d4bad..b1714944cfd 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -922,6 +922,12 @@ QStringList AndroidConfig::allEssentials() const return allPackages; } +static QStringList packagesWithoutNdks(const QStringList &packages) +{ + return Utils::filtered(packages, [] (const QString &p) { + return !p.startsWith(ndkPackageMarker()); }); +} + bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) { QStringList essentialPkgs(allEssentials()); @@ -933,8 +939,7 @@ bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) break; } if (!m_defaultNdk.isEmpty()) - essentialPkgs = Utils::filtered(essentialPkgs, [] (const QString &p) { - return !p.startsWith(ndkPackageMarker()); }); + essentialPkgs = packagesWithoutNdks(essentialPkgs); return essentialPkgs.isEmpty() ? true : false; }