Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 3 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h
index 64792f23a2..e590083bc3 100644
--- a/src/qml/jsruntime/qv4typedarray_p.h
+++ b/src/qml/jsruntime/qv4typedarray_p.h
@@ -156,8 +156,8 @@ struct Q_QML_PRIVATE_EXPORT TypedArray : Object
         return d()->byteLength/d()->type->bytesPerElement;
     }
 
-    QTypedArrayData<char> *arrayData() {
-        return d()->buffer->data;
+    QArrayDataPointer<char> *arrayData() {
+        return &d()->buffer->data();
     }
 
     Heap::TypedArray::Type arrayType() const {
@@ -181,6 +181,7 @@ struct IntrinsicTypedArrayCtor: FunctionObject
     static constexpr VTable::Call virtualCall = nullptr;
 
     static ReturnedValue method_of(const FunctionObject *, const Value *thisObject, const Value *argv, int argc);
+    static ReturnedValue method_from(const FunctionObject *, const Value *thisObject, const Value *argv, int argc);
 };
 
 struct TypedArrayCtor: FunctionObject