aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2017-11-13 15:54:24 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2017-11-14 14:54:16 +0000
commit056c9c641f7d66cef670dba8a8dbd72e93cdb6ee (patch)
tree1defee59394ae93c6dab8496487cda8f73425b1a /src
parentde43bd5a596ce6a5a88bf9c28b937f155d339cca (diff)
QmlDesigner: Filter modifiers in override event
We have to ignore Qt::KeypadModifier. Task-number: QTCREATORBUG-19272 Change-Id: I0233812e3c7e4623a00ef077f9a5057db5ba8b93 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
index ad3c7c8db4..f46df03687 100644
--- a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
@@ -193,7 +193,12 @@ bool TextEditorWidget::eventFilter( QObject *, QEvent *event)
return true;
}
- QKeySequence keySqeuence(keyEvent->key() | keyEvent->modifiers());
+ static const Qt::KeyboardModifiers relevantModifiers = Qt::ShiftModifier
+ | Qt::ControlModifier
+ | Qt::AltModifier
+ | Qt::MetaModifier;
+
+ QKeySequence keySqeuence(keyEvent->key() | (keyEvent->modifiers() & relevantModifiers));
for (QKeySequence overrideSequence : overrideSequences)
if (keySqeuence.matches(overrideSequence)) {
keyEvent->accept();