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

CMakePM: Fix MSVC assertion with tests/manual/cmakepresets

Browse Source 
Change-Id: I5f06d69b444e453456f2dd9822006b535d3f7843
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-05-16 16:14:28 +02:00
parent d491faf94a
commit 9c8acbf40e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -115,7 +115,16 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
&& left.inherits.value() == right.inherits.value(); && left.inherits.value() == right.inherits.value();
const bool leftInheritsRight = left.inherits const bool leftInheritsRight = left.inherits
&& left.inherits.value().contains(right.name); && left.inherits.value().contains(right.name);
if ((left.inherits && !right.inherits) || leftInheritsRight || sameInheritance)
const bool inheritsGreater = left.inherits && right.inherits
&& left.inherits.value().first()
> right.inherits.value().first();
const bool noInheritsGreater = !left.inherits && !right.inherits
&& left.name > right.name;
if ((left.inherits && !right.inherits) || leftInheritsRight || sameInheritance
|| inheritsGreater || noInheritsGreater)
return false; return false;
return true; return true;
}); });