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

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/qml/jsruntime/qv4arrayobject.cpp
	src/qml/jsruntime/qv4engine.cpp

Change-Id: Ie3ef6202b6a3a8521971e1be10c40c6a2db6989c

diff --cc src/qml/compiler/qv4ssa.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4arrayobject.cpp
index 838c541,fbd757a..abe8a44
--- 1/src/qml/jsruntime/qv4arrayobject.cpp
--- 2/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@@ -366,8 -371,8 +366,8 @@@ ReturnedValue ArrayPrototype::method_sh
  
      ScopedValue result(scope);
  
-     if (!instance->protoHasArray() && !instance->arrayData()->hasAttributes() && instance->arrayData()->length() <= len) {
 -    if (!instance->protoHasArray() && !instance->arrayData->hasAttributes() && instance->arrayData->length() <= len && instance->arrayData->type != ArrayData::Custom) {
 -        result = instance->arrayData->vtable()->pop_front(instance.getPointer());
++    if (!instance->protoHasArray() && !instance->arrayData()->hasAttributes() && instance->arrayData()->length() <= len && instance->arrayData()->type() != ArrayData::Custom) {
 +        result = instance->arrayData()->vtable()->pop_front(instance.getPointer());
      } else {
          result = instance->getIndexed(0);
          if (scope.hasException())
@@@ -545,8 -550,8 +545,8 @@@ ReturnedValue ArrayPrototype::method_un
  
      uint len = instance->getLength();
  
-     if (!instance->protoHasArray() && !instance->arrayData()->hasAttributes() && instance->arrayData()->length() <= len) {
 -    if (!instance->protoHasArray() && !instance->arrayData->hasAttributes() && instance->arrayData->length() <= len && instance->arrayData->type != ArrayData::Custom) {
 -        instance->arrayData->vtable()->push_front(instance.getPointer(), ctx->callData->args, ctx->callData->argc);
++    if (!instance->protoHasArray() && !instance->arrayData()->hasAttributes() && instance->arrayData()->length() <= len && instance->arrayData()->type() != ArrayData::Custom) {
 +        instance->arrayData()->vtable()->push_front(instance.getPointer(), ctx->d()->callData->args, ctx->d()->callData->argc);
      } else {
          ScopedValue v(scope);
          for (uint k = len; k > 0; --k) {

diff --cc src/qml/jsruntime/qv4engine.cpp
index f2cfc3e,72be889..7be5189
--- 1/src/qml/jsruntime/qv4engine.cpp
--- 2/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@@ -851,8 -839,12 +851,12 @@@ void ExecutionEngine::markObjects(
  
      ExecutionContext *c = currentContext();
      while (c) {
-         c->mark(this);
 -        Q_ASSERT(c->inUse);
 -        if (!c->markBit) {
 -            c->markBit = 1;
++        Q_ASSERT(c->inUse());
++        if (!c->markBit()) {
++            c->d()->markBit = 1;
+             c->markObjects(c, this);
+         }
 -        c = c->parent;
 +        c = c->d()->parent;
      }
  
      id_empty->mark(this);

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

diff --cc src/qmltest/quicktestresult.cpp
Simple merge

diff --cc src/quick/items/qquickgridview.cpp
Simple merge

diff --cc src/quick/items/qquickitemview.cpp
Simple merge

diff --cc src/quick/items/qquickitemview_p_p.h
Simple merge

diff --cc src/quick/items/qquicklistview.cpp
Simple merge

diff --cc src/quick/items/qquickpathview.cpp
Simple merge

diff --cc src/quick/items/qquickwindow.cpp
Simple merge

diff --cc src/quick/scenegraph/util/qsgatlastexture.cpp
Simple merge

diff --cc tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Simple merge