summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Kenttala <ext-marko.r.kenttala@nokia.com>2012-07-11 13:09:05 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-13 11:08:10 (GMT)
commita9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c (patch)
tree9574a88c8afc8a6e614e3e77e512c823aa810d87
parentf8edd0bad1f41267a1805297a5bc8717685cad2a (diff)
downloadQt-a9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c.zip
Qt-a9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c.tar.gz
Qt-a9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c.tar.bz2
Fix for enter key inserting into password fields in Symbian
QML TextInput and TextField elements with echoMode TextInput.Password adds enter key into container string. Modified filtering in Symbian QCoeFepInputContext to disable adding enter key for hidden editors. Task-Number: 1009418 Change-Id: If7928ccdb131d11f8c975b0efe890b85f3ba202e Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index b6ca59a..132df7d 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -743,7 +743,8 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
if (keyEvent->type() == QEvent::KeyPress
&& currentHints & Qt::ImhHiddenText
- && !keyEvent->text().isEmpty()) {
+ && !keyEvent->text().isEmpty()
+ && keyEvent->key() != Qt::Key_Enter) {
// Send some temporary preedit text in order to make text visible for a moment.
m_preeditString = keyEvent->text();
QList<QInputMethodEvent::Attribute> attributes;