diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:10:30 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:10:30 +0200 |
commit | e73bd4875d5a07d5357bbcb46d581dd32b3821de (patch) | |
tree | 22d5edc6d9db20f751789e11992bfa71af230bf0 | |
parent | aac99aa2cd204c0e285dc5f1c1aebf4c1ee19a7a (diff) | |
parent | 9b0be663f82acd2b527615420071ea791cecedc6 (diff) |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: I8ab0165d5e923874023e7473fa7db849deed6198
-rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 9 |
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; } |