diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp index 84bcaa83574ab6ee29a4de78990198629a4b4e4d..5cd0a136af0b44455fb84ea1524c20a3e99802f4 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp @@ -190,12 +190,16 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e) { switch (e->type()) { case QEvent::ShortcutOverride: - if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) + if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) { d->m_escapePressed = true; + e->accept(); + } break; case QEvent::KeyPress: - if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) + if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) { d->m_escapePressed = true; + e->accept(); + } if (d->m_model->size() > 1) { QKeyEvent *ke = static_cast<QKeyEvent*>(e); if (ke->key() == Qt::Key_Up) { diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 6422ffb10c0a337f1e7104a271fb597bb5c74e3d..024acecb088c65ef051f2753689771689af62023 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -571,6 +571,7 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e) switch (ke->key()) { case Qt::Key_Escape: abort(); + e->accept(); return true; case Qt::Key_N: