summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-07-21 16:31:29 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-22 18:40:21 +0000
commitf3138e9d533d8db723cf6f325ad8f84902a021f1 (patch)
treeb1cbf8aa0eb9e0862c46646dc1ad73264587a162 /src
parent4a2c3d11831c7d79cb19a8754c587d10928459ad (diff)
Sync default action when checking tool button programmatically
QAbstractButton::setChecked is not virtual, so QToolButton cannot override to synchronize the default action's checked state. This resulted in button and default action not being in sync when the checked state of the button was changed programmatically, while changing the checked state on the action kept the button in sync. Connect to the button's own toggled signal instead to keep the state of the default action in sync. Make it a unique connection to allow multiple calls to setDefaultAction, which are used by QToolButton to keep the button updated if properties of the default action change. Add a test that confirms that button and action are synchronized both ways, and that we only get single signal emissions when changing either programmatically. Fixes: QTBUG-95255 Change-Id: I0e027faf1da763ef1878e46e85bfa70073c8bf82 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 188d739400e10fc8571bbf2ec86d5cd338b04a5d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/widgets/qtoolbutton.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 1b04f3df72..81b2998849 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -963,6 +963,12 @@ void QToolButton::setDefaultAction(QAction *action)
}
#endif
setCheckable(action->isCheckable());
+ if (action->isCheckable()) {
+ connect(this, &QAbstractButton::toggled, this, [this](bool checked) {
+ if (defaultAction())
+ defaultAction()->setChecked(checked);
+ }, Qt::UniqueConnection);
+ }
setChecked(action->isChecked());
setEnabled(action->isEnabled());
if (action->d_func()->fontSet)