diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-26 21:06:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-26 21:06:26 (GMT) |
| commit | dad08f791a05890dc94f91d2154a334eb4359a8f (patch) | |
| tree | f4f8c67d7d33320382f4f56d87e26dde842f2807 | |
| parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
| parent | 91096126440aafba22aeb9307cb72135b3156a4c (diff) | |
| download | Qt-dad08f791a05890dc94f91d2154a334eb4359a8f.zip Qt-dad08f791a05890dc94f91d2154a334eb4359a8f.tar.gz Qt-dad08f791a05890dc94f91d2154a334eb4359a8f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Porting the QTBUG-21084 fix to 4.7.4
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index d0c8cc8..92aa6d0 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; |