diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-04-27 05:22:20 (GMT) |
| commit | dcf9a1f2f20248de0da9549af54bc3a4844eaf5b (patch) | |
| tree | c9eee3ff39000816113bcab3a5c035da97c2a9fc /src/gui/inputmethod/qinputcontext.cpp | |
| parent | 47712d1f330e4b22ce6dd30e7557288ef7f7fca0 (diff) | |
| parent | 415951891cd75170f1e4b89b46effa3319b56e4e (diff) | |
| download | Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.zip Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.gz Qt-dcf9a1f2f20248de0da9549af54bc3a4844eaf5b.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Diffstat (limited to 'src/gui/inputmethod/qinputcontext.cpp')
| -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. */ |