1 files changed, 18 insertions, 21 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 5cb346a462..6b308374e6 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -63,8 +63,9 @@ namespace Heap {
 
 struct QQmlValueTypeReference : QQmlValueTypeWrapper
 {
-    QQmlValueTypeReference() {}
-    QPointer<QObject> object;
+    QQmlValueTypeReference() { object.init(); }
+    ~QQmlValueTypeReference() { object.destroy(); }
+    QQmlQPointer<QObject> object;
     int property;
 };
 
@@ -332,7 +333,8 @@ ReturnedValue QQmlValueTypeWrapper::method_toString(CallContext *ctx)
     if (QMetaType::convert(w->d()->gadgetPtr, w->d()->valueType->typeId, &convertResult, QMetaType::QString)) {
         result = convertResult;
     } else {
-        result = QString::fromUtf8(QMetaType::typeName(w->d()->valueType->typeId)) + QLatin1Char('(');
+        result += QString::fromUtf8(QMetaType::typeName(w->d()->valueType->typeId))
+                + QLatin1Char('(');
         const QMetaObject *mo = w->d()->propertyCache->metaObject();
         const int propCount = mo->propertyCount();
         for (int i = 0; i < propCount; ++i) {
@@ -369,10 +371,10 @@ ReturnedValue QQmlValueTypeWrapper::get(const Managed *m, String *name, bool *ha
 
     if (result->isFunction())
         // calling a Q_INVOKABLE function of a value type
-        return QV4::QObjectMethod::create(v4->rootContext(), r, result->coreIndex);
+        return QV4::QObjectMethod::create(v4->rootContext(), r, result->coreIndex());
 
 #define VALUE_TYPE_LOAD(metatype, cpptype, constructor) \
-    if (result->propType == metatype) { \
+    if (result->propType() == metatype) { \
         cpptype v; \
         void *args[] = { &v, 0 }; \
         metaObject->d.static_metacall(reinterpret_cast<QObject*>(gadget), QMetaObject::ReadProperty, index, args); \
@@ -381,7 +383,7 @@ ReturnedValue QQmlValueTypeWrapper::get(const Managed *m, String *name, bool *ha
 
     const QMetaObject *metaObject = r->d()->propertyCache->metaObject();
 
-    int index = result->coreIndex;
+    int index = result->coreIndex();
     QQmlMetaObject::resolveGadgetMethodOrPropertyIndex(QMetaObject::ReadProperty, &metaObject, &index);
 
     void *gadget = r->d()->gadgetPtr;
@@ -394,10 +396,10 @@ ReturnedValue QQmlValueTypeWrapper::get(const Managed *m, String *name, bool *ha
 
     QVariant v;
     void *args[] = { Q_NULLPTR, Q_NULLPTR };
-    if (result->propType == QMetaType::QVariant) {
+    if (result->propType() == QMetaType::QVariant) {
         args[0] = &v;
     } else {
-        v = QVariant(result->propType, static_cast<void *>(Q_NULLPTR));
+        v = QVariant(result->propType(), static_cast<void *>(Q_NULLPTR));
         args[0] = v.data();
     }
     metaObject->d.static_metacall(reinterpret_cast<QObject*>(gadget), QMetaObject::ReadProperty, index, args);
@@ -431,8 +433,6 @@ void QQmlValueTypeWrapper::put(Managed *m, String *name, const Value &value)
     const QQmlPropertyData *pd = r->d()->propertyCache->property(name, 0, 0);
     if (!pd)
         return;
-    QMetaProperty property = metaObject->property(pd->coreIndex);
-    Q_ASSERT(property.isValid());
 
     if (reference) {
         QV4::ScopedFunctionObject f(scope, value);
@@ -448,27 +448,24 @@ void QQmlValueTypeWrapper::put(Managed *m, String *name, const Value &value)
             QQmlContextData *context = v4->callingQmlContext();
 
             QQmlPropertyData cacheData;
-            cacheData.setFlags(QQmlPropertyData::IsWritable |
-                               QQmlPropertyData::IsValueTypeVirtual);
-            cacheData.propType = writeBackPropertyType;
-            cacheData.coreIndex = reference->d()->property;
-            cacheData.valueTypeFlags = 0;
-            cacheData.valueTypeCoreIndex = pd->coreIndex;
-            cacheData.valueTypePropType = property.userType();
+            cacheData.setWritable(true);
+            cacheData.setPropType(writeBackPropertyType);
+            cacheData.setCoreIndex(reference->d()->property);
 
             QV4::Scoped<QQmlBindingFunction> bindingFunction(scope, (const Value &)f);
             bindingFunction->initBindingLocation();
 
-            QQmlBinding *newBinding = new QQmlBinding(value, reference->d()->object, context);
-            newBinding->setTarget(reference->d()->object, cacheData);
+            QQmlBinding *newBinding = QQmlBinding::create(&cacheData, value, reference->d()->object, context);
+            newBinding->setTarget(reference->d()->object, cacheData, pd);
             QQmlPropertyPrivate::setBinding(newBinding);
             return;
         } else {
-            QQmlPropertyPrivate::removeBinding(reference->d()->object, QQmlPropertyData::encodeValueTypePropertyIndex(reference->d()->property, pd->coreIndex));
-
+            QQmlPropertyPrivate::removeBinding(reference->d()->object, QQmlPropertyIndex(reference->d()->property, pd->coreIndex()));
         }
     }
 
+    QMetaProperty property = metaObject->property(pd->coreIndex());
+    Q_ASSERT(property.isValid());
 
     QVariant v = v4->toVariant(value, property.userType());