Allow property bindings to be easily created from JavaScript

Properties can now be assigned a function that returns the binding
value.

Task-number: QTBUG-14964
Reviewed-by: Aaron Kennedy

1 files changed, 17 insertions, 8 deletions

diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 76829b7..61e3002 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -1480,19 +1480,28 @@ QDeclarativePropertyPrivate::restore(const QByteArray &data, QObject *object, QD
     if (data.isEmpty())
         return prop;
 
-    prop.d = new QDeclarativePropertyPrivate;
-    prop.d->object = object;
-    prop.d->context = ctxt;
-    prop.d->engine = ctxt->engine;
-
     const SerializedData *sd = (const SerializedData *)data.constData();
     if (sd->isValueType) {
         const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
-        prop.d->core = vt->core;
-        prop.d->valueType = vt->valueType;
+        return restore(vt->core, vt->valueType, object, ctxt);
     } else {
-        prop.d->core = sd->core;
+        QDeclarativePropertyCache::ValueTypeData data;
+        return restore(sd->core, data, object, ctxt);
     }
+}
+
+QDeclarativeProperty
+QDeclarativePropertyPrivate::restore(const QDeclarativePropertyCache::Data &data, const QDeclarativePropertyCache::ValueTypeData &valueType, QObject *object, QDeclarativeContextData *ctxt)
+{
+    QDeclarativeProperty prop;
+
+    prop.d = new QDeclarativePropertyPrivate;
+    prop.d->object = object;
+    prop.d->context = ctxt;
+    prop.d->engine = ctxt->engine;
+
+    prop.d->core = data;
+    prop.d->valueType = valueType;
 
     return prop;
 }