Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 20 insertions, 25 deletions

diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index cd4a120..de6ee2e 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -265,7 +265,6 @@ struct ModelNode
 
     QmlListModel *modelCache;
     ModelObject *objectCache;
-    bool isArray;
 };
 
 QT_END_NAMESPACE
@@ -281,7 +280,6 @@ void ModelNode::setObjectValue(const QScriptValue& valuemap) {
         ModelNode *value = new ModelNode;
         QScriptValue v = it.value();
         if (v.isArray()) {
-            value->isArray = true;
             value->setListValue(v);
         } else {
             value->values << v.toVariant();
@@ -298,7 +296,6 @@ void ModelNode::setListValue(const QScriptValue& valuelist) {
         ModelNode *value = new ModelNode;
         QScriptValue v = it.value();
         if (v.isArray()) {
-            value->isArray = true;
             value->setListValue(v);
         } else if (v.isObject()) {
             value->setObjectValue(v);
@@ -370,29 +367,27 @@ QVariant QmlListModel::valueForNode(ModelNode *node) const
 {
     QObject *rv = 0;
 
-    if (node->isArray) {
+    if (!node->properties.isEmpty()) {
+        // Object
+        rv = node->object(this);
+    } else if (node->values.count() == 0) {
+        // Invalid
+        return QVariant();
+    } else if (node->values.count() == 1) {
+        // Value
+        QVariant &var = node->values[0];
+        ModelNode *valueNode = qvariant_cast<ModelNode *>(var);
+        if (valueNode) {
+            if (!valueNode->properties.isEmpty())
+                rv = valueNode->object(this);
+            else
+                rv = valueNode->model(this);
+        } else {
+            return var;
+        }
+    } else if (node->values.count() > 1) {
         // List
         rv = node->model(this);
-    } else {
-        if (!node->properties.isEmpty()) {
-            // Object
-            rv = node->object(this);
-        } else if (node->values.count() == 0) {
-            // Invalid
-            return QVariant();
-        } else if (node->values.count() == 1) {
-            // Value
-            QVariant &var = node->values[0];
-            ModelNode *valueNode = qvariant_cast<ModelNode *>(var);
-            if (valueNode) {
-                if (!valueNode->properties.isEmpty())
-                    rv = valueNode->object(this);
-                else
-                    rv = valueNode->model(this);
-            } else {
-                return var;
-            }
-        }
     }
 
     if (rv)
@@ -938,7 +933,7 @@ static void dump(ModelNode *node, int ind)
 }
 
 ModelNode::ModelNode()
-: modelCache(0), objectCache(0), isArray(false)
+: modelCache(0), objectCache(0)
 {
 }