summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2011-03-23 13:40:34 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2011-03-23 13:40:34 (GMT)
commit98d65b5967d5f8a1648d73185986fabab97e692b (patch)
tree4440dbf9bbea48c27a90333981307fef734eb946 /src/gui/widgets
parent1e5a471645ea8c91b0a2dc0fe019f15fdc5f9127 (diff)
parent8700366079f6346ab0ba8baa624993832127188e (diff)
downloadQt-98d65b5967d5f8a1648d73185986fabab97e692b.zip
Qt-98d65b5967d5f8a1648d73185986fabab97e692b.tar.gz
Qt-98d65b5967d5f8a1648d73185986fabab97e692b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qlinecontrol.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index d108ad9..5a281ad 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -414,13 +414,17 @@ 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());
+ c += event->commitString().length() - qMin(-event->replacementStart(), event->replacementLength());
m_cursor += event->replacementStart();