From c8aca8a3abe33dd4e39e1a371b337b76866b91ad Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 9 Dec 2022 14:59:23 +0100 Subject: [PATCH] Beautifier/ClangFormat: Fix style check box states 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 4933697d9a5b38299340e265d2f4e6c78dd1604a Fixes: QTCREATORBUG-28525 Change-Id: Ia6af5f6083975faa5a65cdc9dd0bd2b671af147b Reviewed-by: Reviewed-by: hjk --- .../beautifier/clangformat/clangformatoptionspage.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index d6244eb466d..1e6a9f5c14a 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -47,8 +48,10 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings * auto options = new QGroupBox(tr("Options")); options->setEnabled(false); + auto styleButtonGroup = new QButtonGroup(this); + auto useCustomizedStyle = new QRadioButton(tr("Use customized style:")); - useCustomizedStyle->setAutoExclusive(true); + styleButtonGroup->addButton(useCustomizedStyle); m_configurations = new ConfigurationPanel; m_configurations->setSettings(m_settings); @@ -57,7 +60,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings * m_usePredefinedStyle = new QRadioButton(tr("Use predefined style:")); m_usePredefinedStyle->setChecked(true); - m_usePredefinedStyle->setAutoExclusive(true); + styleButtonGroup->addButton(m_usePredefinedStyle); m_predefinedStyle = new QComboBox; m_predefinedStyle->addItems(m_settings->predefinedStyles());