From 7fc3d58dedff59b33358041e63d910430b44a1e9 Mon Sep 17 00:00:00 2001
From: Marko Kenttala <ext-marko.r.kenttala@nokia.com>
Date: Wed, 11 Jul 2012 16:09:05 +0300
Subject: 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>
(cherry picked from commit a9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c)
Reviewed-by: Aapo Haapanen <ext-aapo.haapanen@nokia.com>
---
 src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index b6ca59a53a..132df7d0af 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;
-- 
cgit v1.2.3