diff options
| -rw-r--r-- | src/widgets/widgets/qwidgetlinecontrol.cpp | 7 | ||||
| -rw-r--r-- | tests/auto/shared/platforminputcontext.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 90fbfc1639..a82dd99591 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -1607,6 +1607,13 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event) if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { if (hasAcceptableInput() || fixup()) { + + QInputMethod *inputMethod = QApplication::inputMethod(); + inputMethod->commit(); + QWidget *lineEdit = qobject_cast<QWidget *>(parent()); + if (!(lineEdit && lineEdit->inputMethodHints() & Qt::ImhMultiLine)) + inputMethod->hide(); + emit accepted(); emit editingFinished(); } diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h index fc415d833b..22b7ad6610 100644 --- a/tests/auto/shared/platforminputcontext.h +++ b/tests/auto/shared/platforminputcontext.h @@ -56,6 +56,8 @@ public: virtual void reset() { m_resetCallCount++; } virtual void commit() { m_commitCallCount++; + if (m_commitString.isEmpty()) + return; QInputMethodEvent commitEvent; commitEvent.setCommitString(m_commitString); if (qGuiApp->focusObject()) |