diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 10:11:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 10:11:04 (GMT) |
| commit | 7e3efb88e7781294408d94ad703eea60d21ff7be (patch) | |
| tree | 72981dac2963104c495a0f56339df7748318a7fc /src/gui | |
| parent | fcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4 (diff) | |
| parent | c422ed3b861ab92276c91a6672b313f037de6ff6 (diff) | |
| download | Qt-7e3efb88e7781294408d94ad703eea60d21ff7be.zip Qt-7e3efb88e7781294408d94ad703eea60d21ff7be.tar.gz Qt-7e3efb88e7781294408d94ad703eea60d21ff7be.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update QML "What's New" docs.
Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.
Fix ListView boundary extents for RTL layout.
Fix compiler warning.
Diffstat (limited to 'src/gui')
| -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 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()); |