1 files changed, 19 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index e880289d9d..15f57f0761 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -53,6 +53,7 @@
 #include <private/qqmlcomponentattached_p.h>
 #include <private/qqmlcomponent_p.h>
 #include <private/qqmlcustomparser_p.h>
+#include <private/qqmlscriptstring_p.h>
 
 QT_USE_NAMESPACE
 
@@ -649,6 +650,24 @@ bool QmlObjectCreator::setPropertyValue(QQmlPropertyData *property, int bindingI
         return true;
     }
 
+    // ### resolve this at compile time
+    if (property && property->propType == qMetaTypeId<QQmlScriptString>()) {
+        QQmlScriptString ss(binding->valueAsScriptString(&qmlUnit->header), context->asQQmlContext(), _scopeObject);
+        ss.d.data()->bindingId = QQmlBinding::Invalid;
+        ss.d.data()->lineNumber = binding->location.line;
+        ss.d.data()->columnNumber = binding->location.column;
+        ss.d.data()->isStringLiteral = binding->type == QV4::CompiledData::Binding::Type_String;
+        ss.d.data()->isNumberLiteral = binding->type == QV4::CompiledData::Binding::Type_Number;
+        ss.d.data()->numberValue = binding->valueAsNumber();
+
+        QQmlPropertyPrivate::WriteFlags propertyWriteFlags = QQmlPropertyPrivate::BypassInterceptor |
+                                                                   QQmlPropertyPrivate::RemoveBindingOnAliasWrite;
+        int propertyWriteStatus = -1;
+        void *argv[] = { &ss, 0, &propertyWriteStatus, &propertyWriteFlags };
+        QMetaObject::metacall(_qobject, QMetaObject::WriteProperty, property->coreIndex, argv);
+        return true;
+    }
+
     QObject *createdSubObject = 0;
     if (binding->type == QV4::CompiledData::Binding::Type_Object) {
         createdSubObject = createInstance(binding->value.objectIndex, _qobject);