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

CMakePM: Allow presets inherits for deeper hierarchies

Browse Source 
Fixes: QTCREATORBUG-28498
Change-Id: Idea5cdec6ad6acfba289dd77632770b7dfbf64f2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2022-11-28 19:16:08 +01:00
parent 6eed65e92a
commit 9deef74d9e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,14 +96,24 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
for (const auto &p : presets) for (const auto &p : presets)
presetsHash.insert(p.name, p); presetsHash.insert(p.name, p);
auto resolveInherits = [](const auto &presetsHash, auto &presetsList) { auto resolveInherits = [](auto &presetsHash, auto &presetsList) {
Utils::sort(presetsList, [](const auto &left, const auto &right) {
if (left.inherits) {
if (left.inherits.value().contains(right.name))
return false;
}
return true;
});
for (auto &p : presetsList) { for (auto &p : presetsList) {
if (!p.inherits) if (!p.inherits)
continue; continue;
for (const QString &inheritFromName : p.inherits.value()) for (const QString &inheritFromName : p.inherits.value()) {
if (presetsHash.contains(inheritFromName)) if (presetsHash.contains(inheritFromName)) {
p.inheritFrom(presetsHash[inheritFromName]); p.inheritFrom(presetsHash[inheritFromName]);
presetsHash[p.name] = p;
}
}
} }
}; };