diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-25 20:36:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-02 15:41:11 +0100 |
| commit | 552d959d90cfad6e15b82a9616bfa6a3679cd782 (patch) | |
| tree | a83ddb48b579cda57d811190fab7d339b8076d45 /src | |
| parent | 39b715f32a44c136271aecf2c3e28704cbf9e546 (diff) | |
Fix QQuickTextInput not overriding shortcuts (del/home...)
[ChangeLog][QtQuick] QQuickTextInput would not accept
delete/home/backspace/left/right keys when the key was used in a
shortcut.
Task-number: QTBUG-34517
Change-Id: I553af8247191ecdadcb4677e9fc85848270a95d3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index d4427eb47e..1dd1dfa57e 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1679,6 +1679,7 @@ bool QQuickTextInput::event(QEvent* ev) || ke == QKeySequence::SelectAll || ke == QKeySequence::SelectEndOfDocument) { ke->accept(); + return true; } else if (ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier || ke->modifiers() == Qt::KeypadModifier) { if (ke->key() < Qt::Key_Escape) { @@ -1692,6 +1693,7 @@ bool QQuickTextInput::event(QEvent* ev) case Qt::Key_Backspace: case Qt::Key_Left: case Qt::Key_Right: + ke->accept(); return true; default: break; |