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

ProjectExplorer: Factor out function to compare toolchain suitability

Browse Source 
... and use in ToolchainKitAspect in addition to KitManager.

Change-Id: I4c9221735a660697baab667877cc335ee0ee3e78
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-08-08 15:24:49 +02:00
parent 077de5aab6
commit b6299edf1f
4 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/kitaspects.cpp
View File

@@ -460,22 +460,20 @@ static void setToolchainsFromAbis(Kit *k, const LanguagesAndAbis &abisByLanguage
// Set a matching bundle for each LanguageCategory/Abi pair, if possible.
for (auto it = abisByCategory.cbegin(); it != abisByCategory.cend(); ++it) {
QList<ToolchainBundle> matchingBundles
const QList<ToolchainBundle> matchingBundles
= Utils::filtered(bundles, [&it](const ToolchainBundle &b) {
return b.factory()->languageCategory() == it.key() && b.targetAbi() == it.value();
});
// FIXME: Re-use the algorithm from KitManager
Utils::sort(matchingBundles, [](const ToolchainBundle &b1, const ToolchainBundle &b2) {
return b1.get(&Toolchain::priority) > b2.get(&Toolchain::priority);
});
if (!matchingBundles.isEmpty()) {
ToolchainKitAspect::setBundle(k, matchingBundles.first());
} else {
if (matchingBundles.isEmpty()) {
for (const Id language : it.key())
ToolchainKitAspect::clearToolchain(k, language);
continue;
}
const auto bestBundle
= std::min_element(bundles.begin(), bundles.end(), &ToolchainManager::isBetterToolchain);
ToolchainKitAspect::setBundle(k, *bestBundle);
}
}