diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:38:22 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:38:22 (GMT) |
| commit | be25f9e17eac2b99d83951dbc0bd1b6e09d91e57 (patch) | |
| tree | e10e3bade3973f66907e3152daeb4fc6cfe247a8 /src/gui/inputmethod | |
| parent | 33db4e2533b3e4e07d37b651b65491195be403ab (diff) | |
| parent | f6909d47b981720cb87cb96454cdf9ea493383ee (diff) | |
| download | Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.zip Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.tar.gz Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.tar.bz2 | |
Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/gui/styles/qs60style.cpp
Diffstat (limited to 'src/gui/inputmethod')
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 9b5e917..ebf0ff8 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -843,13 +843,6 @@ void QCoeFepInputContext::applyFormat(QList<QInputMethodEvent::Attribute> *attri } } - if (attributes->size() == oldSize) { - // S60 didn't provide any format, so let's give our own instead. - attributes->append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, - 0, - m_preeditString.size(), - standardFormat(PreeditFormat))); - } } void QCoeFepInputContext::queueInputCapabilitiesChanged() |