From b546c8524d6cb4a41179e6379af5cb801a3ff42d Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 28 Aug 2024 15:32:52 +0200
Subject: [PATCH] PE: Fix setting toolchain to matching abi

Limit to matching bundles.

Fixes: QTCREATORBUG-31435
Change-Id: I389baa7fdc7bf86f38ff15244ff717329a4b3407
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/kitaspects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp
index 60ca66ee17b..1c3cb84c1b8 100644
--- a/src/plugins/projectexplorer/kitaspects.cpp
+++ b/src/plugins/projectexplorer/kitaspects.cpp
@@ -472,7 +472,7 @@ static void setToolchainsFromAbis(Kit *k, const LanguagesAndAbis &abisByLanguage
         }
 
         const auto bestBundle
-            = std::min_element(bundles.begin(), bundles.end(), &ToolchainManager::isBetterToolchain);
+            = std::min_element(matchingBundles.begin(), matchingBundles.end(), &ToolchainManager::isBetterToolchain);
         ToolchainKitAspect::setBundle(k, *bestBundle);
     }
 }