diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 11:54:04 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 11:54:04 (GMT) |
| commit | 9f51c31a0f492c20e6d882b2ae1e036b29c2755c (patch) | |
| tree | cbb3beed71735514632b4f2788b63e72667cfc04 /src/declarative/graphicsitems/qdeclarativetextinput.cpp | |
| parent | 0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (diff) | |
| parent | 4f933036a0ecbc6e6174b312ec2fd6078cea5b70 (diff) | |
| download | Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.zip Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.tar.gz Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/network/ssl/qsslcertificate.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index c17a360..5928d31 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -878,7 +878,8 @@ void QDeclarativeTextInputPrivate::updateInputMethodHints() \o TextInput.Normal - Displays the text as it is. (Default) \o TextInput.Password - Displays asterixes instead of characters. \o TextInput.NoEcho - Displays nothing. - \o TextInput.PasswordEchoOnEdit - Displays all but the current character as asterixes. + \o TextInput.PasswordEchoOnEdit - Displays characters as they are entered + while editing, otherwise displays asterisks. \endlist */ QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode() const |