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, 5 insertions, 1 deletions

diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 8184bda..80eb9c3 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -43,6 +43,7 @@
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
 #include <private/qmlcustomparser_p.h>
+#include <private/qmlparser_p.h>
 #include "qmlopenmetaobject.h"
 #include <qmlcontext.h>
 #include <qmlbindablevalue.h>
@@ -414,8 +415,11 @@ bool ListModelParser::compileProperty(const QmlCustomParserProperty &prop, QList
 
         } else {
 
+            QmlParser::Variant variant = 
+                qvariant_cast<QmlParser::Variant>(value);
+
             int ref = data.count();
-            QByteArray d = value.toString().toLatin1();
+            QByteArray d = variant.asScript().toLatin1();
             d.append('\0');
             data.append(d);