Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

1 files changed, 2 insertions, 4 deletions

diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index 39b08dbc1e..eec65c8625 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -659,24 +659,22 @@ int QShortcut::id() const
 bool QShortcut::event(QEvent *e)
 {
     Q_D(QShortcut);
-    bool handled = false;
     if (d->sc_enabled && e->type() == QEvent::Shortcut) {
         auto se = static_cast<QShortcutEvent *>(e);
         if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){
 #if QT_CONFIG(whatsthis)
             if (QWhatsThis::inWhatsThisMode()) {
                 QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis);
-                handled = true;
             } else
 #endif
             if (se->isAmbiguous())
                 emit activatedAmbiguously();
             else
                 emit activated();
-            handled = true;
+            return true;
         }
     }
-    return handled;
+    return QObject::event(e);
 }
 #endif // QT_NO_SHORTCUT