summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmllistmodel.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-09 06:42:55 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-09 06:42:55 (GMT)
commit813cf7f88015680206aafb1d9dfd05900e64abbd (patch)
tree715289261f218b6e48937672d01f9e15d2d52d61 /src/declarative/util/qmllistmodel.cpp
parentc6101765924d2cc8290f342a945106405bc42129 (diff)
downloadQt-813cf7f88015680206aafb1d9dfd05900e64abbd.zip
Qt-813cf7f88015680206aafb1d9dfd05900e64abbd.tar.gz
Qt-813cf7f88015680206aafb1d9dfd05900e64abbd.tar.bz2
ListModel elements can only be values or *lists* of objects, not objects.
Fixes QTBUG-5495
Diffstat (limited to 'src/declarative/util/qmllistmodel.cpp')
-rw-r--r--src/declarative/util/qmllistmodel.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 082d70d..748dca6 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -276,8 +276,6 @@ void ModelNode::setObjectValue(const QScriptValue& valuemap) {
QScriptValue v = it.value();
if (v.isArray()) {
value->setListValue(v);
- } else if (v.isObject()) {
- value->setObjectValue(v);
} else {
value->values << v.toVariant();
}