Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/qml/qml/qqmlbinding.cpp
	src/qml/jsruntime/qv4arraybuffer.cpp
	src/qml/jsruntime/qv4functionobject.cpp

Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d

1 files changed, 6 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index 08b3ec76e9..efc4a78835 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -54,6 +54,7 @@
 QT_BEGIN_NAMESPACE
 
 class QV8Engine;
+class QQmlValueType;
 
 namespace QV4 {
 
@@ -62,13 +63,12 @@ namespace Heap {
 struct QQmlValueTypeWrapper : Object {
     QQmlValueTypeWrapper(ExecutionEngine *engine);
     ~QQmlValueTypeWrapper();
-    mutable QQmlRefPointer<QQmlPropertyCache> propertyCache;
+    QQmlRefPointer<QQmlPropertyCache> propertyCache;
     mutable void *gadgetPtr;
-    mutable int metaType;
+    QQmlValueType *valueType;
 
     void setValue(const QVariant &value) const;
     QVariant toVariant() const;
-    void *gadget() const { return gadgetPtr; }
 };
 
 }
@@ -84,8 +84,10 @@ public:
     static ReturnedValue create(ExecutionEngine *engine, const QVariant &, const QMetaObject *metaObject, int typeId);
 
     QVariant toVariant() const;
-    void toGadget(void *data) const;
+    bool toGadget(void *data) const;
     bool isEqual(const QVariant& value);
+    int typeId() const;
+    bool write(QObject *target, int propertyIndex) const;
 
     static ReturnedValue get(const Managed *m, String *name, bool *hasProperty);
     static void put(Managed *m, String *name, const Value &value);