diff options
author | hjk <hjk@qt.io> | 2022-01-18 17:38:31 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2022-01-19 11:03:18 +0000 |
commit | d8e2a3fd45dff6e1c11ac77480604e5d5ca859a2 (patch) | |
tree | 5493e6b1622a46e6a53ce3e30e6d15b230bf2ed1 /src/plugins/android/androidconfigurations.cpp | |
parent | 248b6d843e2e184b93443e95aa78a589c82803f7 (diff) | |
download | qt-creator-d8e2a3fd45dff6e1c11ac77480604e5d5ca859a2.tar.gz |
Android: De-noise toolchain detection a bit
Change-Id: Iab68004fd6310b5658bd9c3c1e23a761e3414ead
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/plugins/android/androidconfigurations.cpp')
-rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 9ba6eb96ea..700f8a063f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1191,12 +1191,13 @@ static bool matchToolChain(const ToolChain *atc, const ToolChain *btc) void AndroidConfigurations::registerNewToolChains() { - const QList<ToolChain *> existingAndroidToolChains + const Toolchains existingAndroidToolChains = ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); - QList<ToolChain *> newToolchains = AndroidToolChainFactory::autodetectToolChains( + + const Toolchains newToolchains = AndroidToolChainFactory::autodetectToolChains( existingAndroidToolChains); - foreach (ToolChain *tc, newToolchains) + for (ToolChain *tc : newToolchains) ToolChainManager::registerToolChain(tc); registerCustomToolChainsAndDebuggers(); @@ -1351,11 +1352,12 @@ static QVariant findOrRegisterDebugger(ToolChain *tc, void AndroidConfigurations::registerCustomToolChainsAndDebuggers() { - const QList<ToolChain *> existingAndroidToolChains = ToolChainManager::toolChains( + const Toolchains existingAndroidToolChains = ToolChainManager::toolChains( Utils::equal(&ToolChain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); - QList<FilePath> customNdks = Utils::transform(currentConfig().getCustomNdkList(), + + const FilePaths customNdks = Utils::transform(currentConfig().getCustomNdkList(), FilePath::fromString); - QList<ToolChain *> customToolchains + const Toolchains customToolchains = AndroidToolChainFactory::autodetectToolChainsFromNdks(existingAndroidToolChains, customNdks, true); @@ -1404,7 +1406,7 @@ void AndroidConfigurations::updateAutomaticKitList() } // register new kits - const QList<ToolChain *> toolchains = ToolChainManager::toolChains([](const ToolChain *tc) { + const Toolchains toolchains = ToolChainManager::toolChains([](const ToolChain *tc) { return tc->isAutoDetected() && tc->isValid() && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID; @@ -1419,7 +1421,7 @@ void AndroidConfigurations::updateAutomaticKitList() if (tcNdk != currentConfig().ndkLocation(qt)) continue; - const QList<ToolChain *> allLanguages + const Toolchains allLanguages = Utils::filtered(toolchains, [tc, tcNdk](ToolChain *otherTc) { FilePath otherNdk = static_cast<const AndroidToolChain *>(otherTc)->ndkLocation(); return tc->targetAbi() == otherTc->targetAbi() && tcNdk == otherNdk; |