diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2017-01-11 10:01:44 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2017-01-17 09:15:19 +0000 |
| commit | e12b9b0db32a7480f3beb0ee7be919f059b80c21 (patch) | |
| tree | 038c290c31ea8f5166d588b61f229ad916de36dd /src/widgets/widgets/qkeysequenceedit.cpp | |
| parent | 17515f1b621952846237dfcdd401bb76f132a20d (diff) | |
QKeySequenceEdit: If the next key is Key_unknown then it should be ignored
When triggering a combination of keys which is causing a dead key then
it will send Key_unknown which is not a valid key to be used in a
shortcut so it should just skip past it as if it were a modifier key.
Task-number: QTBUG-57932
Change-Id: I16e004b84f3aa854f8f8f2bbdf86beb6d764de48
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/widgets/widgets/qkeysequenceedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qkeysequenceedit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/widgets/qkeysequenceedit.cpp b/src/widgets/widgets/qkeysequenceedit.cpp index 2fbc42330d..3252ce5941 100644 --- a/src/widgets/widgets/qkeysequenceedit.cpp +++ b/src/widgets/widgets/qkeysequenceedit.cpp @@ -257,7 +257,8 @@ void QKeySequenceEdit::keyPressEvent(QKeyEvent *e) if (nextKey == Qt::Key_Control || nextKey == Qt::Key_Shift || nextKey == Qt::Key_Meta - || nextKey == Qt::Key_Alt) { + || nextKey == Qt::Key_Alt + || nextKey == Qt::Key_unknown) { return; } |