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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/qtsupport/examplesparser.cpp

Change-Id: I2a0808261969e8c7cef7fae86d9027a155bf9b14
This commit is contained in:
Eike Ziller
2023-07-19 16:10:37 +02:00
parent f10d0bad01 182104e013
commit 626378de2d
12 changed files with 243 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,10 +60,12 @@ public:
autoFormatOnlyCurrentProject.setSettingsKey("autoFormatOnlyCurrentProject");
autoFormatOnlyCurrentProject.setDefaultValue(true);
autoFormatOnlyCurrentProject.setLabelText(Tr::tr("Restrict to files contained in the current project"));
autoFormatOnlyCurrentProject.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox);
autoFormatMime.setSettingsKey("autoFormatMime");
autoFormatMime.setDefaultValue("text/x-cmake");
autoFormatMime.setLabelText(Tr::tr("Restrict to MIME types:"));
autoFormatMime.setDisplayStyle(StringAspect::LineEditDisplay);
setLayouter([this] {
using namespace Layouting;
@@ -73,9 +75,12 @@ public:
Group {
title(Tr::tr("Automatic Formatting on File Save")),
autoFormatOnSave.groupChecker(),
Form {
autoFormatMime, br,
Span(2, autoFormatOnlyCurrentProject)
// Conceptually, that's a Form, but this would look odd:
// xxxxxx [____]
// [x] xxxxxxxxxxxxxx
Column {
Row { autoFormatMime },
autoFormatOnlyCurrentProject
}
},
st