aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:10:30 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:10:30 +0200
commite73bd4875d5a07d5357bbcb46d581dd32b3821de (patch)
tree22d5edc6d9db20f751789e11992bfa71af230bf0
parentaac99aa2cd204c0e285dc5f1c1aebf4c1ee19a7a (diff)
parent9b0be663f82acd2b527615420071ea791cecedc6 (diff)
Merge 5.14 into 5.14.1v5.14.15.14.1
-rw-r--r--src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 34086ad..b99b714 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;
}