diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-05 15:00:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-05 15:00:28 (GMT) |
| commit | daa4d04090c75ac8e64552f6d14834b2b79d2abb (patch) | |
| tree | 3f4bbf6e2c7f42b18af124d2d35e1867238ca736 /src/gui/text/qtextcontrol.cpp | |
| parent | 8c7180dd0ed9bd13724c75dc26f0fb18b0f48e7c (diff) | |
| parent | 4cd683231190443e5243f66098c7322e3808a131 (diff) | |
| download | Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.zip Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.tar.gz Qt-daa4d04090c75ac8e64552f6d14834b2b79d2abb.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index b727c19..175b6b1 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1835,7 +1835,8 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) e->ignore(); return; } - bool isGettingInput = !e->commitString().isEmpty() || !e->preeditString().isEmpty() + bool isGettingInput = !e->commitString().isEmpty() + || e->preeditString() != cursor.block().layout()->preeditAreaText() || e->replacementLength() > 0; if (isGettingInput) { |