diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-17 16:03:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-17 16:03:30 (GMT) |
| commit | 323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47 (patch) | |
| tree | 507963fe94cddf49d9632dd980e3478e8aae5109 /src/gui/widgets | |
| parent | af0749b1bf75f30eb956697fbe96bd75b80af031 (diff) | |
| parent | e30e6e1502e33bf5d1b4d9536a17c9fac9866bbe (diff) | |
| download | Qt-323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47.zip Qt-323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47.tar.gz Qt-323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index b6e2f90..a8031e7 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE #ifdef QT_GUI_PASSWORD_ECHO_DELAY -static int qt_passwordEchoDelay = QT_GUI_PASSWORD_ECHO_DELAY; +static const int qt_passwordEchoDelay = QT_GUI_PASSWORD_ECHO_DELAY; #endif /*! @@ -93,8 +93,8 @@ void QLineControl::updateDisplayText(bool forceUpdate) if (m_echoMode == QLineEdit::Password) { str.fill(m_passwordCharacter); #ifdef QT_GUI_PASSWORD_ECHO_DELAY - if (m_passwordEchoTimer != 0 && !str.isEmpty()) { - int cursor = m_text.length() - 1; + if (m_passwordEchoTimer != 0 && m_cursor > 0 && m_cursor <= m_text.length()) { + int cursor = m_cursor - 1; QChar uc = m_text.at(cursor); str[cursor] = uc; if (cursor > 0 && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) { |