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

CMakePM: Display presets as part of the project outline

Browse Source 
Fixes: QTCREATORBUG-28966
Change-Id: Iae0f77956bf6f4682ea8a25e08d05de3331c7420
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Cristian Adam
2023-05-09 13:49:50 +02:00
parent aca8e5906b
commit dc18d4b9ee
6 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,14 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
result.version = cmakePresetsData.version;
result.cmakeMinimimRequired = cmakePresetsData.cmakeMinimimRequired;
result.include = cmakePresetsData.include;
if (result.include) {
if (cmakeUserPresetsData.include)
result.include->append(cmakeUserPresetsData.include.value());
} else {
result.include = cmakeUserPresetsData.include;
}
auto combinePresetsInternal = [](auto &presetsHash,
auto &presets,
auto &userPresets,