summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-06 15:04:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-06 15:04:18 (GMT)
commitdadb47e632d65ce886295e7848856d4030d6e7de (patch)
treedc9754fe6fdb808bd10e3116272bb18dc7ed6d43
parent882e65fe9d03e10431b350ae0c6abf3429e0bd97 (diff)
parent46c8a0e19715f40a5b5facbaaaa2fa52cf1d354e (diff)
downloadQt-dadb47e632d65ce886295e7848856d4030d6e7de.zip
Qt-dadb47e632d65ce886295e7848856d4030d6e7de.tar.gz
Qt-dadb47e632d65ce886295e7848856d4030d6e7de.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Horizontal lines appearing under entered characters
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index daa448b..10e7e44 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -826,13 +826,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()