From d8e2a3fd45dff6e1c11ac77480604e5d5ca859a2 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 18 Jan 2022 17:38:31 +0100
Subject: [PATCH] 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>
---
 src/plugins/android/androidconfigurations.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 9ba6eb96ea1..700f8a063f4 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;