diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-20 11:14:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-20 11:14:06 (GMT) |
| commit | fc23b31d5d041ef44e917801b7c1083196ea95a0 (patch) | |
| tree | db5716b0c859cbcd5c9d6e62aed7700a72c6bdc4 /src/declarative | |
| parent | ad9a14e5fae51d46c94d7664dfa299dc5301550a (diff) | |
| parent | b7b20e33f36fd942811af33eae906ccdcf486112 (diff) | |
| download | Qt-fc23b31d5d041ef44e917801b7c1083196ea95a0.zip Qt-fc23b31d5d041ef44e917801b7c1083196ea95a0.tar.gz Qt-fc23b31d5d041ef44e917801b7c1083196ea95a0.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Check for buffer overflow in Lookup_MarkMarkPos
Delay masking the last character in Password echo mode.
Updated license headers.
Prevent failed rendering for NPOT textures in GLES2.
Don't use GL_REPEAT for NPOT textures in GLES2.
Avoid crash when surface creation fails.
Add system tests from research:systemtests repository.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 |
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(); |