diff options
| author | axis <qt-info@nokia.com> | 2009-11-04 10:18:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-04 10:18:15 (GMT) |
| commit | 67105efc1e1ebfb435ad5d64171111799959a7c3 (patch) | |
| tree | 9f330a35f0e0bf48ae844f4eceea84ba001568f1 /src/gui/text | |
| parent | bffb6602177476f08710b40a83205b9ab839f6f4 (diff) | |
| parent | fc45c07c27100591750ad5c360fde535e15b9dbd (diff) | |
| download | Qt-67105efc1e1ebfb435ad5d64171111799959a7c3.zip Qt-67105efc1e1ebfb435ad5d64171111799959a7c3.tar.gz Qt-67105efc1e1ebfb435ad5d64171111799959a7c3.tar.bz2 | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'src/gui/text')
| -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 3f6545c..9497b6f 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1831,7 +1831,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) { |