Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I248564d46971206adc9dcf1567a03e6c6354efe7

1 files changed, 9 insertions, 0 deletions

diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 34086ad0..b99b7147 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -511,6 +511,15 @@ bool QVirtualKeyboardInputContextPrivate::filterEvent(const QEvent *event)
         if (!preeditText.isEmpty())
             commit();
     }
+#ifdef QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION
+    else if (type == QEvent::ShortcutOverride) {
+        const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
+        int key = keyEvent->key();
+        if ((key >= Qt::Key_Left && key <= Qt::Key_Down) || key == Qt::Key_Return)
+            return true;
+    }
+#endif
+
     return false;
 }