From 9b0be663f82acd2b527615420071ea791cecedc6 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Mon, 13 Jan 2020 11:22:42 +0100
Subject: Fix arrow key navigation when shortcuts are set for arrow keys

Fixes: QTBUG-81240
Change-Id: I169307295718ed285c525b82194d30c8197e5d95
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

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;
 }
 
-- 
cgit v1.2.3