summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-03-12 13:16:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 15:44:18 +0100
commit2f8ff3a686a7685640b686f0f4a9c3663d89fba5 (patch)
treec55fed9f1ff44c2c0a3c70261580ed1580660269
parent513fdfbe7555461663e42a646bf42e1c0f50d1f7 (diff)
Action: Don't trigger disabled actions -- duh!
Task-number: QTBUG-30150 Change-Id: Iec9142089cb59e8c66554005ff693f9fa6f70293 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/controls/qtaction.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/controls/qtaction.cpp b/src/controls/qtaction.cpp
index c13201db9..3dc01592f 100644
--- a/src/controls/qtaction.cpp
+++ b/src/controls/qtaction.cpp
@@ -268,6 +268,9 @@ bool QtAction::event(QEvent *e)
void QtAction::trigger()
{
+ if (!m_enabled)
+ return;
+
if (m_checkable && !(m_checked && m_exclusiveGroup))
setChecked(!m_checked);