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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
	doc/qtcreator/src/qtcreator-toc.qdoc

Change-Id: Ibea5488fda972321c448c64fad7f657e84d62cdb
This commit is contained in:
Eike Ziller
2024-04-30 14:23:09 +02:00
parent 15e56078b6 289b42aba4
commit 0f4efacb91
20 changed files with 259 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,6 +136,8 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
&& left.inherits.value().contains(right.name);
const bool inheritsGreater = left.inherits && right.inherits
&& !left.inherits.value().isEmpty()
&& !right.inherits.value().isEmpty()
&& left.inherits.value().first()
> right.inherits.value().first();