summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-07-20 11:01:24 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-07-20 11:01:24 (GMT)
commitb7b20e33f36fd942811af33eae906ccdcf486112 (patch)
treeb79f93c0cb2ef72056a378aec0d28a770ae07b8a /src/declarative/graphicsitems
parente35c073c72bb297b4760ee4041ce487c08723d14 (diff)
parentb8205bd9dc0288f66f1c23e9f227e703bc6712bd (diff)
downloadQt-b7b20e33f36fd942811af33eae906ccdcf486112.zip
Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.gz
Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 3fd4fcd..5245236 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1046,7 +1046,7 @@ void QDeclarativeTextInputPrivate::focusChanged(bool hasFocus)
Q_Q(QDeclarativeTextInput);
focused = hasFocus;
q->setCursorVisible(hasFocus && scene && scene->hasFocus());
- if(q->echoMode() == QDeclarativeTextInput::PasswordEchoOnEdit && !hasFocus)
+ if(!hasFocus && control->passwordEchoEditing())
control->updatePasswordEchoEditing(false);//QLineControl sets it on key events, but doesn't deal with focus events
if (!hasFocus)
control->deselect();