diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index ede99938e25..cbf6baa8d0c 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -160,7 +160,8 @@ ToolchainList autodetectToolchainsFromNdks( const QList &ndkLocations, const bool isCustom) { - QList result; + QList newToolchains; + const Id LanguageIds[] { ProjectExplorer::Constants::CXX_LANGUAGE_ID, ProjectExplorer::Constants::C_LANGUAGE_ID @@ -212,6 +213,8 @@ ToolchainList autodetectToolchainsFromNdks( atc->setPlatformLinkerFlags({"-target", target}); atc->setDisplayName(displayName); tc = atc; + + newToolchains << tc; } // Do not only reset newly created toolchains. This triggers call to @@ -220,13 +223,12 @@ ToolchainList autodetectToolchainsFromNdks( gccTc->resetToolchain(compilerCommand); tc->setDetection(Toolchain::AutoDetection); - result << tc; ++targetItr; } } } - return result; + return newToolchains; } ToolchainList autodetectToolchains(const ToolchainList &alreadyKnown)