diff options
author | Eike Ziller <eike.ziller@qt.io> | 2023-05-17 14:55:02 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2023-05-17 14:55:02 +0200 |
commit | 8e8ebc8f8819c187a7cc680764858a86c36b8307 (patch) | |
tree | 89847fc4464c8ac9a00dbd74be79f1ed75a6ca86 /src | |
parent | b2e30e7ef86595c537062cb8261a0735b389949c (diff) | |
parent | 330a30aa5b7562cf8d68f3bd870d3c9b5d15b2fc (diff) | |
download | qt-creator-8e8ebc8f8819c187a7cc680764858a86c36b8307.tar.gz |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
coin/instructions/build.yaml
Change-Id: I697b0107e75c6259989247de2180437d7987ff37
Diffstat (limited to 'src')
5 files changed, 16 insertions, 14 deletions
diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp index 24faf9031d..af8a0846b1 100644 --- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp @@ -39,6 +39,7 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget( m_overrideDefault = new QCheckBox(Tr::tr("Override .clang-format file")); m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings")); m_useGlobalSettings->hide(); + m_overrideDefaultFile = ClangFormatSettings::instance().overrideDefaultFile(); using namespace Layouting; @@ -190,10 +191,12 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox() setTemporarilyReadOnly(); connect(m_overrideDefault, &QCheckBox::toggled, this, [this, setTemporarilyReadOnly](bool checked) { - if (m_project) + if (m_project) { m_project->setNamedSettings(Constants::OVERRIDE_FILE_ID, checked); - else + } else { + ClangFormatSettings::instance().setOverrideDefaultFile(checked); setTemporarilyReadOnly(); + } }); connect(m_codeStyle, @@ -212,12 +215,14 @@ void ClangFormatGlobalConfigWidget::apply() settings.setMode( static_cast<ClangFormatSettings::Mode>(m_indentingOrFormatting->currentIndex())); settings.setOverrideDefaultFile(m_overrideDefault->isChecked()); + m_overrideDefaultFile = m_overrideDefault->isChecked(); } settings.write(); } void ClangFormatGlobalConfigWidget::finish() { + ClangFormatSettings::instance().setOverrideDefaultFile(m_overrideDefaultFile); m_codeStyle->currentPreferences()->setTemporarilyReadOnly( !ClangFormatSettings::instance().overrideDefaultFile()); } diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.h b/src/plugins/clangformat/clangformatglobalconfigwidget.h index 962a7daaf1..7b2d6fe7c9 100644 --- a/src/plugins/clangformat/clangformatglobalconfigwidget.h +++ b/src/plugins/clangformat/clangformatglobalconfigwidget.h @@ -43,6 +43,7 @@ private: ProjectExplorer::Project *m_project; TextEditor::ICodeStylePreferences *m_codeStyle; Utils::Guard m_ignoreChanges; + bool m_overrideDefaultFile; QLabel *m_projectHasClangFormat; QLabel *m_formattingModeLabel; diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index ed138b13aa..9304599d99 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -214,12 +214,7 @@ bool getCurrentOverriddenSettings(const Utils::FilePath &filePath) filePath); return getProjectUseGlobalSettings(project) - ? !TextEditor::TextEditorSettings::codeStyle("Cpp") - ->currentPreferences() - ->isTemporarilyReadOnly() - && !TextEditor::TextEditorSettings::codeStyle("Cpp") - ->currentPreferences() - ->isAdditionalTabDisabled() + ? ClangFormatSettings::instance().overrideDefaultFile() : getProjectOverriddenSettings(project); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index f425af569c..c13cf8709c 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -54,7 +54,6 @@ #include <utils/checkablemessagebox.h> #include <utils/commandline.h> #include <utils/detailswidget.h> -#include <utils/headerviewstretcher.h> #include <utils/infolabel.h> #include <utils/itemviews.h> #include <utils/layoutbuilder.h> @@ -68,6 +67,7 @@ #include <QDialogButtonBox> #include <QDir> #include <QGridLayout> +#include <QHeaderView> #include <QLoggingCategory> #include <QMenu> #include <QMessageBox> @@ -250,7 +250,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : m_configView->setUniformRowHeights(true); m_configView->setSortingEnabled(true); m_configView->sortByColumn(0, Qt::AscendingOrder); - (void) new HeaderViewStretcher(m_configView->header(), 0); + m_configView->header()->setSectionResizeMode(QHeaderView::Stretch); m_configView->setSelectionMode(QAbstractItemView::ExtendedSelection); m_configView->setSelectionBehavior(QAbstractItemView::SelectItems); m_configView->setAlternatingRowColors(true); diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 21862ae4a1..b4e0c08958 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -20,10 +20,11 @@ enum AccessMode { Registry64Mode = 0x4 // Corresponds to QSettings::Registry64Format (5.7) }; -static const char *debuggerApplicationFileC = "qtcdebugger"; -static const WCHAR *debuggerRegistryKeyC = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; -static const WCHAR *debuggerRegistryValueNameC = L"Debugger"; -static const WCHAR *autoRegistryValueNameC = L"Auto"; +constexpr const char debuggerApplicationFileC[] = "qtcdebugger"; +constexpr const WCHAR debuggerRegistryKeyC[] + = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; +constexpr const WCHAR debuggerRegistryValueNameC[] = L"Debugger"; +constexpr const WCHAR autoRegistryValueNameC[] = L"Auto"; static inline QString wCharToQString(const WCHAR *w) { |