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

Android: Don't re-register existing toolchains

Browse Source 
Change-Id: I07f67ac511c193e7fbc86d52f7439f5741ff7c19
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-07-25 17:46:27 +02:00
parent 2da8283bb2
commit b895c599fe
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidtoolchain.cpp
View File

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