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

Beautifier/ClangFormat: Fix style check box states

Browse Source 
Broke when inlining the .ui file. Because the two checkboxes no longer
have the same direct parent, "autoExclusive" does not work, and it needs
an explicit button group.

Amends 4933697d9a

Fixes: QTCREATORBUG-28525
Change-Id: Ia6af5f6083975faa5a65cdc9dd0bd2b671af147b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2022-12-09 14:59:23 +01:00
parent 168ff2c68c
commit c8aca8a3ab
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
View File

@@ -13,6 +13,7 @@
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <QButtonGroup>
#include <QComboBox> #include <QComboBox>
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>
@@ -47,8 +48,10 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
auto options = new QGroupBox(tr("Options")); auto options = new QGroupBox(tr("Options"));
options->setEnabled(false); options->setEnabled(false);
auto styleButtonGroup = new QButtonGroup(this);
auto useCustomizedStyle = new QRadioButton(tr("Use customized style:")); auto useCustomizedStyle = new QRadioButton(tr("Use customized style:"));
useCustomizedStyle->setAutoExclusive(true); styleButtonGroup->addButton(useCustomizedStyle);
m_configurations = new ConfigurationPanel; m_configurations = new ConfigurationPanel;
m_configurations->setSettings(m_settings); m_configurations->setSettings(m_settings);
@@ -57,7 +60,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
m_usePredefinedStyle = new QRadioButton(tr("Use predefined style:")); m_usePredefinedStyle = new QRadioButton(tr("Use predefined style:"));
m_usePredefinedStyle->setChecked(true); m_usePredefinedStyle->setChecked(true);
m_usePredefinedStyle->setAutoExclusive(true); styleButtonGroup->addButton(m_usePredefinedStyle);
m_predefinedStyle = new QComboBox; m_predefinedStyle = new QComboBox;
m_predefinedStyle->addItems(m_settings->predefinedStyles()); m_predefinedStyle->addItems(m_settings->predefinedStyles());