Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.

In PasswordEchoOnEdit mode return the display text instead of the
real text from inputMethodQuery() when not editing the password and
clear old password if new input is received through an input method
event.

Change-Id: I7f24f510bf8e356e460900c3b9ff55ea16b32ab3
Task-number: QTBUG-17562
Reviewed-by: Joona Petrell

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index bffc2b5..5a281ad 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -414,10 +414,14 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event)
     if (isGettingInput) {
         // If any text is being input, remove selected text.
         priorState = m_undoState;
+        if (echoMode() == QLineEdit::PasswordEchoOnEdit && !passwordEchoEditing()) {
+            updatePasswordEchoEditing(true);
+            m_selstart = 0;
+            m_selend = m_text.length();
+        }
         removeSelectedText();
     }
 
-
     int c = m_cursor; // cursor position after insertion of commit string
     if (event->replacementStart() <= 0)
         c += event->commitString().length() - qMin(-event->replacementStart(), event->replacementLength());