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

Merge "Merge remote-tracking branch 'gerrit/12.0'"

Browse Source
This commit is contained in:
The Qt Project
2023-11-13 09:33:54 +00:00
parent 32914fe66b 104959f7f7
commit bbfbfec4e6
14 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -478,6 +478,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
m_model.setPages(m_pages, IOptionsPageProvider::allOptionsPagesProviders());
m_proxyModel.setSortLocaleAware(true);
m_proxyModel.setSourceModel(&m_model);
m_proxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
m_categoryList->setIconSize(QSize(categoryIconSize, categoryIconSize));

2
src/plugins/cppeditor/cppcodemodelsettingspage.cpp
View File

@@ -294,7 +294,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
d->autoIncludeHeadersCheckBox.setChecked(settings.autoIncludeHeaders());
d->autoIncludeHeadersCheckBox.setToolTip(autoIncludeToolTip);
d->threadLimitSpinBox.setValue(settings.workerThreadLimit());
d->threadLimitSpinBox.setSpecialValueText("Automatic");
d->threadLimitSpinBox.setSpecialValueText(Tr::tr("Automatic"));
d->threadLimitSpinBox.setToolTip(workerThreadsToolTip);
d->documentUpdateThreshold.setMinimum(50);
d->documentUpdateThreshold.setMaximum(10000);

4
src/plugins/cppeditor/cppfilesettingspage.cpp
View File

@@ -302,7 +302,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
Column {
Group {
title("Headers"),
title(Tr::tr("Headers")),
Form {
Tr::tr("&Suffix:"), m_headerSuffixComboBox, st, br,
Tr::tr("S&earch paths:"), m_headerSearchPathsEdit, br,
@@ -311,7 +311,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
}
},
Group {
title("Sources"),
title(Tr::tr("Sources")),
Form {
Tr::tr("S&uffix:"), m_sourceSuffixComboBox, st, br,
Tr::tr("Se&arch paths:"), m_sourceSearchPathsEdit, br,