Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ica75a71062d0613e415f2433c5c22c2e251b37cd

1 files changed, 7 insertions, 0 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 9224c071fd..2ba802a19e 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1407,6 +1407,10 @@ bool QQuickWindow::event(QEvent *e)
         d->deliverNativeGestureEvent(d->contentItem, static_cast<QNativeGestureEvent*>(e));
         break;
 #endif
+    case QEvent::ShortcutOverride:
+        if (d->activeFocusItem)
+            sendEvent(d->activeFocusItem, static_cast<QKeyEvent *>(e));
+        return true;
     default:
         break;
     }
@@ -2600,6 +2604,9 @@ bool QQuickWindow::sendEvent(QQuickItem *item, QEvent *e)
             QCoreApplication::sendEvent(item, e);
         }
         break;
+    case QEvent::ShortcutOverride:
+        QCoreApplication::sendEvent(item, e);
+        break;
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseButtonDblClick: