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

ProjectExplorer: Take bundle completeness into account

Browse Source 
... when finding the most suitable toolchain.

Fixes: QTCREATORBUG-31565
Change-Id: Ie5abeb5863713e6350ec654706bd1b6b86fced7f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2024-09-16 12:36:40 +02:00
parent 8676397303
commit 635e746571
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -339,6 +339,11 @@ void ToolchainManager::addBadToolchain(const Utils::FilePath &toolchain)
bool ToolchainManager::isBetterToolchain( bool ToolchainManager::isBetterToolchain(
const ToolchainBundle &bundle1, const ToolchainBundle &bundle2) const ToolchainBundle &bundle1, const ToolchainBundle &bundle2)
{ {
if (const ToolchainBundle::Valid valid1 = bundle1.validity(), valid2 = bundle2.validity();
valid1 != valid2) {
return valid1 == ToolchainBundle::Valid::All || valid2 == ToolchainBundle::Valid::None;
}
const int priority1 = bundle1.get(&Toolchain::priority); const int priority1 = bundle1.get(&Toolchain::priority);
const int priority2 = bundle2.get(&Toolchain::priority); const int priority2 = bundle2.get(&Toolchain::priority);
if (priority1 > priority2) if (priority1 > priority2)