aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickabstractbutton.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
-rw-r--r--src/quicktemplates2/qquickabstractbutton.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 9157b4f9..3b41f34c 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -324,9 +324,10 @@ void QQuickAbstractButtonPrivate::click()
void QQuickAbstractButtonPrivate::trigger()
{
Q_Q(QQuickAbstractButton);
+ const bool wasEnabled = effectiveEnable;
if (action && action->isEnabled())
QQuickActionPrivate::get(action)->trigger(q, false);
- else if (effectiveEnable)
+ if (wasEnabled && (!action || !action->isEnabled()))
emit q->clicked();
}