summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-27 16:04:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-27 16:04:06 (GMT)
commitac51ebee5bcc975829cf59012dfe9bb198016ed1 (patch)
treea85392e2ea8b60344b2d431f29126772d85608f8
parente028a54690f2fedfae6da19fb24b7401e4a71e56 (diff)
parentdad08f791a05890dc94f91d2154a334eb4359a8f (diff)
downloadQt-ac51ebee5bcc975829cf59012dfe9bb198016ed1.zip
Qt-ac51ebee5bcc975829cf59012dfe9bb198016ed1.tar.gz
Qt-ac51ebee5bcc975829cf59012dfe9bb198016ed1.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
-rw-r--r--src/declarative/util/qdeclarativelistmodel.cpp1
1 files changed, 1 insertions, 0 deletions
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;