aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickaction.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-10 14:17:39 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-10 12:28:07 +0000
commit33c09a028ef75a4efba968e88ca666d8ce5fe8e7 (patch)
tree30432a3b597e43a8fb1272bbe9b10f7323408a92 /src/quicktemplates2/qquickaction.cpp
parent06672a7a459bf887845aa2bee2b61486a0409de2 (diff)
QQuickAction: fix deferred delete
Noticed while writing auto tests for the upcoming ActionGroup. Calling action.destroy(); wait(0); did not destroy the action because it did not let QObject::event() handle QEvent::DeferredDelete. Change-Id: Ife491b436800d0bce37189ee118e3ffc5b313542 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickaction.cpp')
-rw-r--r--src/quicktemplates2/qquickaction.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp
index dbe64121..cdc7336e 100644
--- a/src/quicktemplates2/qquickaction.cpp
+++ b/src/quicktemplates2/qquickaction.cpp
@@ -506,7 +506,7 @@ bool QQuickAction::event(QEvent *event)
{
Q_D(QQuickAction);
if (event->type() != QEvent::Shortcut)
- return false;
+ return QObject::event(event);
return d->handleShortcutEvent(this, static_cast<QShortcutEvent *>(event));
}