diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-26 23:00:14 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-26 23:00:14 (GMT) |
| commit | 06f1de5b4d01967d76ed96646cfd7a3ea1679b4d (patch) | |
| tree | 6b64df0b755ffddb5b05738269f0ed69a5abeadf | |
| parent | 1dd59e4cf52b189d6ddf9fe7ff46a30e64e5a2ac (diff) | |
| parent | 20b1263695169e88207c8a4c4aac968a6044931b (diff) | |
| download | Qt-06f1de5b4d01967d76ed96646cfd7a3ea1679b4d.zip Qt-06f1de5b4d01967d76ed96646cfd7a3ea1679b4d.tar.gz Qt-06f1de5b4d01967d76ed96646cfd7a3ea1679b4d.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodel.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 5245236..9bc7fb9 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -874,7 +874,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 diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 28c2df6..9604117 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -784,6 +784,7 @@ void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray & QDeclarativeListModel *rv = static_cast<QDeclarativeListModel *>(obj); ModelNode *root = new ModelNode(rv->m_nested); + rv->m_nested->m_ownsRoot = true; rv->m_nested->_root = root; QStack<ModelNode *> nodes; nodes << root; |