diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:20 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:20 +0200 |
| commit | 163ea1a04d1b00c95373d69e8c907e5789082d3e (patch) | |
| tree | 9f8b25ecb45818147e21027a5faeed0c879601ba | |
| parent | ec9fb19ead796d88bb9a67a4ddd269870cbacb54 (diff) | |
| parent | 28a0b1dc46d1324356e8bcad7004303171c3f1a6 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: I01bd34214dbfd14f4b48054c8e80bdebbe4e6da4
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/client/qwaylandinputcontext.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index ea2250975..b3d5a4fed 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index 47696a6a3..fdf49f5c2 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -93,9 +93,12 @@ void QWaylandTextInput::reset() void QWaylandTextInput::commit() { if (QObject *o = QGuiApplication::focusObject()) { - QInputMethodEvent event; - event.setCommitString(m_preeditCommit); - QCoreApplication::sendEvent(o, &event); + if (!m_preeditCommit.isEmpty()) { + QInputMethodEvent event; + event.setCommitString(m_preeditCommit); + m_preeditCommit = QString(); + QCoreApplication::sendEvent(o, &event); + } } reset(); |