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

CMake: Fix default cmake tool

Browse Source 
If Boot2Qt devices are registered, their CMake tool would often end up
as the default. Instead now we only auto select a cmake tool on the
local machine.

Change-Id: I677ab06ae88ff36209e691ea0fadb356436e973c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-10-10 09:45:10 +02:00
parent c9cf86856c
commit f1c3482e0d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -426,8 +426,9 @@ void CMakeToolManager::ensureDefaultCMakeToolIsValid()
} else { } else {
if (findById(d->m_defaultCMake)) if (findById(d->m_defaultCMake))
return; return;
auto cmakeTool = Utils::findOrDefault( auto cmakeTool = Utils::findOrDefault(cmakeTools(), [](CMakeTool *tool) {
cmakeTools(), [](CMakeTool *tool){ return tool->detectionSource().isEmpty(); }); return tool->detectionSource().isEmpty() && !tool->cmakeExecutable().needsDevice();
});
if (cmakeTool) if (cmakeTool)
d->m_defaultCMake = cmakeTool->id(); d->m_defaultCMake = cmakeTool->id();
} }