diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:05:02 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:05:02 (GMT) |
| commit | 5662cda2d836f448d036ed516d0b9a2795f6905c (patch) | |
| tree | 5de0ec34ddec6c342a5189386460be3128967746 /src/gui/widgets/qlinecontrol.cpp | |
| parent | 2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398 (diff) | |
| parent | 7e3efb88e7781294408d94ad703eea60d21ff7be (diff) | |
| download | Qt-5662cda2d836f448d036ed516d0b9a2795f6905c.zip Qt-5662cda2d836f448d036ed516d0b9a2795f6905c.tar.gz Qt-5662cda2d836f448d036ed516d0b9a2795f6905c.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/gui/widgets/qlinecontrol.cpp')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index f20e018..3eac64a 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()); |