diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-01 20:08:48 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-01 20:08:48 (GMT) |
| commit | fce8548775c7813e1c9fca463f269de40fb2b1dc (patch) | |
| tree | e43351955b8d5c2b64670b8016e5961df17e04df /src | |
| parent | 1fe501ac8c922ae1698c9566a398b99e200a3716 (diff) | |
| parent | a19cbae234f134c1ec6cdcc9a23d5d14cc4fcff8 (diff) | |
| download | Qt-fce8548775c7813e1c9fca463f269de40fb2b1dc.zip Qt-fce8548775c7813e1c9fca463f269de40fb2b1dc.tar.gz Qt-fce8548775c7813e1c9fca463f269de40fb2b1dc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/inputmethod/qinputcontext.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp index 063aefd..f083e51 100644 --- a/src/gui/inputmethod/qinputcontext.cpp +++ b/src/gui/inputmethod/qinputcontext.cpp @@ -355,9 +355,10 @@ void QInputContext::widgetDestroyed(QWidget *widget) in complex input method. In the case, call QInputContext::reset() to ensure proper termination of inputting. - You must not send any QInputMethodEvent except empty InputMethodEnd event using - QInputContext::reset() at reimplemented reset(). It will break - input state consistency. + In a reimplementation of reset(), you must not send any + QInputMethodEvent containing preedit text. You can only commit + string and attributes; otherwise, you risk breaking input state + consistency. */ |