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, 5 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4arraybuffer_p.h b/src/qml/jsruntime/qv4arraybuffer_p.h
index cbcde18793..a7f9e92c80 100644
--- a/src/qml/jsruntime/qv4arraybuffer_p.h
+++ b/src/qml/jsruntime/qv4arraybuffer_p.h
@@ -48,6 +48,7 @@ struct ArrayBufferCtor : FunctionObject {
 
 struct Q_QML_PRIVATE_EXPORT ArrayBuffer : Object {
     ArrayBuffer(ExecutionEngine *e, size_t length);
+    ArrayBuffer(ExecutionEngine *e, const QByteArray& array);
     ~ArrayBuffer();
     QTypedArrayData<char> *data;
 
@@ -74,15 +75,11 @@ struct Q_QML_PRIVATE_EXPORT ArrayBuffer : Object
 
     QByteArray asByteArray() const;
     uint byteLength() const { return d()->byteLength(); }
-    char *data() {
-        // ### detach if refcount > 1
-        return d()->data->data();
-    }
-    const char *constData() {
-        // ### detach if refcount > 1
-        return d()->data->data();
-    }
+    char *data() { detach(); return d()->data ? d()->data->data() : 0; }
+    const char *constData() { detach(); return d()->data ? d()->data->data() : 0; }
 
+private:
+    void detach();
 };
 
 struct ArrayBufferPrototype: Object