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/clangformat/clangformatutils.cpp

Change-Id: Ide285cc25fca9101843ab9dca01c5a33644aca7f
This commit is contained in:
Eike Ziller
2023-06-14 08:43:08 +02:00
parent 87a9345398 cf90e478e6
commit e7870f736d
95 changed files with 759 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/clangformat/clangformatglobalconfigwidget.cpp
View File

@@ -205,15 +205,15 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox()
connect(m_indentingOrFormatting, &QComboBox::currentIndexChanged,
this, setEnableOverrideCheckBox);
m_overrideDefault->setToolTip(Tr::tr(
"When this option is enabled, ClangFormat will use a\n"
"user-specified configuration from the widget below,\n"
"instead of the project .clang-format file. You can\n"
"customize the formatting options for your code by\n"
"adjusting the settings in the widget. Note that any\n"
"changes made there will only affect the current\n"
"configuration, and will not modify the project\n"
".clang-format file."));
m_overrideDefault->setToolTip("<html>"
+ Tr::tr("When this option is enabled, ClangFormat will use a "
"user-specified configuration from the widget below, "
"instead of the project .clang-format file. You can "
"customize the formatting options for your code by "
"adjusting the settings in the widget. Note that any "
"changes made there will only affect the current "
"configuration, and will not modify the project "
".clang-format file."));
m_overrideDefault->setChecked(getProjectOverriddenSettings(m_project));
setTemporarilyReadOnly();