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

CMakePM: fix presets sort assert with MSVC in debug mode

Browse Source 
Amends 9deef74d9e

Change-Id: Id4e7fcbfa6bdc8ac65afc2c93510e8389d7e7fe4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-02-02 12:53:57 +01:00
parent d8b2673ad1
commit 2eb9338be0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,10 +98,8 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
auto resolveInherits = [](auto &presetsHash, auto &presetsList) { auto resolveInherits = [](auto &presetsHash, auto &presetsList) {
Utils::sort(presetsList, [](const auto &left, const auto &right) { Utils::sort(presetsList, [](const auto &left, const auto &right) {
if (left.inherits) { if (!left.inherits || left.inherits.value().contains(right.name))
if (left.inherits.value().contains(right.name)) return false;
return false;
}
return true; return true;
}); });
for (auto &p : presetsList) { for (auto &p : presetsList) {