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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I1ce9876150239751a1187bc0c4b8fc5fef1ab40d
This commit is contained in:
Eike Ziller
2022-03-14 14:02:14 +01:00
parent 71d858f2d2 4594250b6c
commit 3f0c8b2149
26 changed files with 186 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -128,7 +128,12 @@ mergeTools(std::vector<std::unique_ptr<CMakeTool>> &sdkTools,
std::unique_ptr<CMakeTool> userTool = std::move(userTools[0]);
userTools.erase(std::begin(userTools));
int userToolIndex = Utils::indexOf(result, Utils::equal(&CMakeTool::id, userTool->id()));
int userToolIndex = Utils::indexOf(result, [&userTool](const std::unique_ptr<CMakeTool> &tool) {
// Id should be sufficient, but we have older "mis-registered" docker based items.
// Make sure that these don't override better new values from the sdk by
// also checking the actual executable.
return userTool->id() == tool->id() && userTool->cmakeExecutable() == tool->cmakeExecutable();
});
if (userToolIndex >= 0) {
// Replace the sdk tool with the user tool, so any user changes do not get lost
result[userToolIndex] = std::move(userTool);