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

diff --cc src/qml/jsapi/qjsengine.cpp
Simple merge

diff --cc src/qml/jsapi/qjsvalue.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4arraybuffer.cpp
index 432d70f,11664f1..145e400
--- 1/src/qml/jsruntime/qv4arraybuffer.cpp
--- 2/src/qml/jsruntime/qv4arraybuffer.cpp
+++ b/src/qml/jsruntime/qv4arraybuffer.cpp
@@@ -95,6 -95,13 +95,13 @@@ Heap::ArrayBuffer::ArrayBuffer(Executio
      memset(data->data(), 0, length + 1);
  }
  
 -    : Heap::Object(e->emptyClass, e->arrayBufferPrototype.asObject())
+ Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, const QByteArray& array)
++    : Heap::Object(e->emptyClass, e->arrayBufferPrototype.as<QV4::Object>())
+     , data(const_cast<QByteArray&>(array).data_ptr())
+ {
+     data->ref.ref();
+ }
+ 
  Heap::ArrayBuffer::~ArrayBuffer()
  {
      if (!data->ref.deref())

diff --cc src/qml/jsruntime/qv4arraybuffer_p.h
Simple merge

diff --cc src/qml/jsruntime/qv4context.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4engine.cpp
index 9b9a234,cbfac86..8859f73
--- 1/src/qml/jsruntime/qv4engine.cpp
--- 2/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@@ -305,9 -305,13 +305,13 @@@ ExecutionEngine::ExecutionEngine(EvalIS
      uint index;
      InternalClass *functionProtoClass = emptyClass->addMember(id_prototype, Attr_NotEnumerable, &index);
      Q_ASSERT(index == Heap::FunctionObject::Index_Prototype);
 -    functionPrototype = memoryManager->alloc<FunctionPrototype>(functionProtoClass, objectPrototype.asObject());
 +    functionPrototype = memoryManager->alloc<FunctionPrototype>(functionProtoClass, objectPrototype.as<Object>());
      functionClass = emptyClass->addMember(id_prototype, Attr_NotEnumerable|Attr_NotConfigurable, &index);
      Q_ASSERT(index == Heap::FunctionObject::Index_Prototype);
+     simpleScriptFunctionClass = functionClass->addMember(id_name, Attr_ReadOnly, &index);
+     Q_ASSERT(index == Heap::SimpleScriptFunction::Index_Name);
+     simpleScriptFunctionClass = simpleScriptFunctionClass->addMember(id_length, Attr_ReadOnly, &index);
+     Q_ASSERT(index == Heap::SimpleScriptFunction::Index_Length);
      protoClass = emptyClass->addMember(id_constructor, Attr_NotEnumerable, &index);
      Q_ASSERT(index == Heap::FunctionObject::Index_ProtoConstructor);
  

diff --cc src/qml/jsruntime/qv4engine_p.h
Simple merge

diff --cc src/qml/jsruntime/qv4errorobject.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4functionobject.cpp
index f5db520,0a12d01..5a68cf6
--- 1/src/qml/jsruntime/qv4functionobject.cpp
--- 2/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@@ -63,8 -63,9 +63,9 @@@ using namespace QV4
  DEFINE_OBJECT_VTABLE(FunctionObject);
  
  Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, QV4::String *name, bool createProto)
 -    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.asObject())
 +    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.objectValue())
      , scope(scope->d())
+     , function(Q_NULLPTR)
  {
      Scope s(scope->engine());
      ScopedFunctionObject f(s, this);
@@@ -72,8 -73,9 +73,9 @@@
  }
  
  Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, Function *function, bool createProto)
 -    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.asObject())
 +    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.objectValue())
      , scope(scope->d())
+     , function(Q_NULLPTR)
  {
      Scope s(scope->engine());
      ScopedString name(s, function->name());
@@@ -82,8 -84,9 +84,9 @@@
  }
  
  Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, const QString &name, bool createProto)
 -    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.asObject())
 +    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.objectValue())
      , scope(scope->d())
+     , function(Q_NULLPTR)
  {
      Scope s(scope->engine());
      ScopedFunctionObject f(s, this);
@@@ -92,8 -95,9 +95,9 @@@
  }
  
  Heap::FunctionObject::FunctionObject(ExecutionContext *scope, const QString &name, bool createProto)
 -    : Heap::Object(scope->engine->functionClass, scope->engine->functionPrototype.asObject())
 +    : Heap::Object(scope->engine->functionClass, scope->engine->functionPrototype.objectValue())
      , scope(scope)
+     , function(Q_NULLPTR)
  {
      Scope s(scope->engine);
      ScopedFunctionObject f(s, this);
@@@ -102,8 -106,9 +106,9 @@@
  }
  
  Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, const ReturnedValue name)
 -    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.asObject())
 +    : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype.objectValue())
      , scope(scope->d())
+     , function(Q_NULLPTR)
  {
      Scope s(scope);
      ScopedFunctionObject f(s, this);
@@@ -112,8 -117,9 +117,9 @@@
  }
  
  Heap::FunctionObject::FunctionObject(ExecutionContext *scope, const ReturnedValue name)
 -    : Heap::Object(scope->engine->functionClass, scope->engine->functionPrototype.asObject())
 +    : Heap::Object(scope->engine->functionClass, scope->engine->functionPrototype.objectValue())
      , scope(scope)
+     , function(Q_NULLPTR)
  {
      Scope s(scope->engine);
      ScopedFunctionObject f(s, this);
@@@ -446,8 -466,10 +465,10 @@@ ReturnedValue ScriptFunction::call(cons
  DEFINE_OBJECT_VTABLE(SimpleScriptFunction);
  
  Heap::SimpleScriptFunction::SimpleScriptFunction(QV4::ExecutionContext *scope, Function *function, bool createProto)
-     : Heap::FunctionObject(scope, function, createProto)
 -    : Heap::FunctionObject(function->compilationUnit->engine->simpleScriptFunctionClass, function->compilationUnit->engine->functionPrototype.asObject())
++    : Heap::FunctionObject(function->compilationUnit->engine->simpleScriptFunctionClass, function->compilationUnit->engine->functionPrototype.as<QV4::Object>())
  {
+     this->scope = scope->d();
+ 
      this->function = function;
      function->compilationUnit->addref();
      Q_ASSERT(function);

diff --cc src/qml/jsruntime/qv4functionobject_p.h
Simple merge

diff --cc src/qml/jsruntime/qv4qobjectwrapper.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4value_p.h
Simple merge

diff --cc src/qml/qml/qqmlbinding.cpp
Simple merge

diff --cc src/qml/qml/qqmlcontextwrapper.cpp
Simple merge

diff --cc src/qml/qml/qqmlengine.cpp
Simple merge

diff --cc src/qml/qml/qqmljavascriptexpression.cpp
Simple merge

diff --cc src/qml/qml/qqmlproperty.cpp
Simple merge

diff --cc src/qml/qml/qqmltypewrapper.cpp
Simple merge

diff --cc src/qml/qml/qqmlvaluetypewrapper.cpp
index 0f48c91,397068f..77d76e8
--- 1/src/qml/qml/qqmlvaluetypewrapper.cpp
--- 2/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@@ -248,9 -259,39 +259,39 @@@ bool QQmlValueTypeWrapper::isEqual(cons
      return (value == d()->toVariant());
  }
  
+ int QQmlValueTypeWrapper::typeId() const
+ {
+     return d()->valueType->typeId;
+ }
+ 
+ bool QQmlValueTypeWrapper::write(QObject *target, int propertyIndex) const
+ {
+     bool destructGadgetOnExit = false;
+     if (const QQmlValueTypeReference *ref = as<const QQmlValueTypeReference>()) {
+         if (!d()->gadgetPtr) {
+             d()->gadgetPtr = alloca(d()->valueType->metaType.sizeOf());
+             d()->valueType->metaType.construct(d()->gadgetPtr, 0);
+             destructGadgetOnExit = true;
+         }
+         if (!ref->readReferenceValue())
+             return false;
+     }
+ 
+     int flags = 0;
+     int status = -1;
+     void *a[] = { d()->gadgetPtr, 0, &status, &flags };
+     QMetaObject::metacall(target, QMetaObject::WriteProperty, propertyIndex, a);
+ 
+     if (destructGadgetOnExit) {
+         d()->valueType->metaType.destruct(d()->gadgetPtr);
+         d()->gadgetPtr = 0;
+     }
+     return true;
+ }
+ 
  ReturnedValue QQmlValueTypeWrapper::method_toString(CallContext *ctx)
  {
 -    Object *o = ctx->thisObject().asObject();
 +    Object *o = ctx->thisObject().as<Object>();
      if (!o)
          return ctx->engine()->throwTypeError();
      QQmlValueTypeWrapper *w = o->as<QQmlValueTypeWrapper>();

diff --cc src/qml/qml/qqmlvaluetypewrapper_p.h
index 08b3ec7,cad48e6..efc4a78
--- 1/src/qml/qml/qqmlvaluetypewrapper_p.h
--- 2/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@@ -84,10 -84,12 +84,12 @@@ 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(Managed *m, String *name, bool *hasProperty);
 +    static ReturnedValue get(const Managed *m, String *name, bool *hasProperty);
      static void put(Managed *m, String *name, const Value &value);
      static bool isEqualTo(Managed *m, Managed *other);
      static PropertyAttributes query(const Managed *, String *name);

diff --cc src/qml/qml/v8/qqmlbuiltinfunctions.cpp
Simple merge

diff --cc src/quickwidgets/qquickwidget.cpp
Simple merge