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

Conflicts:
	src/declarative/qml/qmlvme.cpp

1 files changed, 12 insertions, 1 deletions

diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 28b880c..cdc6a66 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -235,6 +235,17 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
             }
             break;
 
+        case QmlInstruction::StoreUrl:
+            {
+                QObject *target = stack.top();
+                void *a[1];
+                QUrl u(primitives.at(instr.storeUrl.value));
+                a[0] = (void *)&u;
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeUrl.propertyIndex, a);
+            }
+            break;
+
         case QmlInstruction::StoreFloat:
             {
                 QObject *target = stack.top();
@@ -246,7 +257,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
             }
             break;
 
-case QmlInstruction::StoreDouble:
+        case QmlInstruction::StoreDouble:
             {
                 QObject *target = stack.top();
                 double d = instr.storeDouble.value;