Implement SetProperties as a custom parser

This will allow us to remove all "Assign*" style instructions from the QML compiler and have it depend only on static data.

1 files changed, 16 insertions, 12 deletions

diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
index e864df9..a60f783 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -120,6 +120,7 @@ QmlCustomParserNodePrivate::fromObject(QmlParser::Object *root)
     return rootNode;
 }
 
+#include <QtCore/qdebug.h>
 QmlCustomParserProperty 
 QmlCustomParserNodePrivate::fromProperty(QmlParser::Property *p)
 {
@@ -127,20 +128,23 @@ QmlCustomParserNodePrivate::fromProperty(QmlParser::Property *p)
     prop.d->name = p->name;
     prop.d->isList = (p->values.count() > 1);
 
-    for(int ii = 0; ii < p->values.count(); ++ii) {
-        Value *v = p->values.at(ii);
+    if (p->value) {
+        QmlCustomParserNode node = fromObject(p->value);
+        QList<QmlCustomParserProperty> props = node.properties();
+        for (int ii = 0; ii < props.count(); ++ii)
+            prop.d->values << QVariant::fromValue(props.at(ii));
+    } else {
+        for(int ii = 0; ii < p->values.count(); ++ii) {
+            Value *v = p->values.at(ii);
+
+            if(v->object) {
+                QmlCustomParserNode node = fromObject(v->object);
+                prop.d->values << QVariant::fromValue(node);
+            } else {
+                prop.d->values << QVariant::fromValue(v->value);
+            }
 
-        // We skip fetched properties for now
-        if(v->object && v->object->type == -1)
-            continue;
-
-        if(v->object) {
-            QmlCustomParserNode node = fromObject(v->object);
-            prop.d->values << QVariant::fromValue(node);
-        } else {
-            prop.d->values << QVariant::fromValue(v->primitive());
         }
-
     }
 
     return prop;