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

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

Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1

diff --cc examples/quick/quick.pro
Simple merge

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

diff --cc src/qml/compiler/qv4isel_masm_p.h
Simple merge

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

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

diff --cc src/qml/jsruntime/qv4arrayobject.cpp
index 652c0f0,d4829e5..efe1dff
--- 1/src/qml/jsruntime/qv4arrayobject.cpp
--- 2/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@@ -302,11 -308,21 +302,11 @@@ ReturnedValue ArrayPrototype::method_pu
          return Encode(newLen);
      }
  
 -    if (!instance->protoHasArray() && instance->arrayDataLen <= len && (instance->flags & SimpleArray)) {
 -        for (int i = 0; i < ctx->callData->argc; ++i) {
 -            if (!instance->sparseArray) {
 -                if (len >= instance->arrayAlloc)
 -                    instance->arrayReserve(len + 1);
 -                instance->arrayData[len].value = ctx->callData->args[i];
 -                if (instance->arrayAttributes)
 -                    instance->arrayAttributes[len] = Attr_Data;
 -                instance->arrayDataLen = len + 1;
 -            } else {
 -                uint j = instance->allocArrayValue(ctx->callData->args[i]);
 -                instance->sparseArray->push_back(j, len);
 -            }
 -            ++len;
 -        }
 +    if (!ctx->callData->argc) {
 +        ;
-     } else if (!instance->protoHasArray() && instance->arrayData->length() <= len) {
++    } else if (!instance->protoHasArray() && instance->arrayData->length() <= len && instance->arrayType() == ArrayData::Simple) {
 +        instance->arrayData->vtable()->putArray(instance.getPointer(), len, ctx->callData->args, ctx->callData->argc);
 +        len = instance->arrayData->length();
      } else {
          for (int i = 0; i < ctx->callData->argc; ++i)
              instance->putIndexed(len + i, ctx->callData->args[i]);

diff --cc src/qml/jsruntime/qv4context.cpp
index 15fea72,8c6d75d..cec42e8
--- 1/src/qml/jsruntime/qv4context.cpp
--- 2/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@@ -71,7 -91,7 +71,7 @@@ CallContext *ExecutionContext::newCallC
          c->lookups = c->compilationUnit->runtimeLookups;
      }
  
-     c->locals = (Value *)(c + 1);
 -    c->locals = (SafeValue *)((quintptr(c + 1) + 7) & ~7);
++    c->locals = (Value *)((quintptr(c + 1) + 7) & ~7);
  
      if (function->varCount)
          std::fill(c->locals, c->locals + function->varCount, Primitive::undefinedValue());

diff --cc src/qml/jsruntime/qv4context_p.h
index 5904d0b,9f905df..f9511d9
--- 1/src/qml/jsruntime/qv4context_p.h
--- 2/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@@ -247,18 -239,9 +247,18 @@@ struct ExecutionContextSave
      }
  };
  
 +inline Scope::Scope(ExecutionContext *ctx)
 +    : engine(ctx->engine)
 +#ifndef QT_NO_DEBUG
 +    , size(0)
 +#endif
 +{
 +    mark = engine->jsStackTop;
 +}
 +
  /* Function *f, int argc */
  #define requiredMemoryForExecutionContect(f, argc) \
-     sizeof(CallContext) + sizeof(Value) * (f->varCount + qMax((uint)argc, f->formalParameterCount)) + sizeof(CallData)
+     ((sizeof(CallContext) + 7) & ~7) + sizeof(Value) * (f->varCount + qMax((uint)argc, f->formalParameterCount)) + sizeof(CallData)
  
  } // namespace QV4
  

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

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

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

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

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

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

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

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

diff --cc src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
Simple merge

diff --cc src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
Simple merge

diff --cc src/quick/scenegraph/qsgcontext.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgcontext_p.h
Simple merge

diff --cc src/quick/scenegraph/qsgrenderloop.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgthreadedrenderloop.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgwindowsrenderloop.cpp
Simple merge

diff --cc src/quick/util/qquickpropertychanges.cpp
Simple merge

diff --cc tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 529b97e,44c113b..bb5f83b
--- 1/tests/auto/qml/qjsengine/tst_qjsengine.cpp
--- 2/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@@ -47,8 -47,8 +47,9 @@@
  #include <qgraphicsitem.h>
  #include <qstandarditemmodel.h>
  #include <QtCore/qnumeric.h>
+ #include <qqmlengine.h>
  #include <stdlib.h>
 +#include <private/qv4alloca_p.h>
  
  #ifdef Q_CC_MSVC
  #define NO_INLINE __declspec(noinline)

diff --cc tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Simple merge

diff --cc tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index 06dc348,4bf5687..54eb350
--- 1/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
--- 2/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@@ -379,22 -378,11 +379,22 @@@ void tst_QQuickAccessible::hitTest(
  
  void tst_QQuickAccessible::checkableTest()
  {
-     QQuickView *window = new QQuickView();
+     QScopedPointer<QQuickView> window(new QQuickView());
      window->setSource(testFileUrl("checkbuttons.qml"));
      window->show();
-     QVERIFY(QTest::qWaitForWindowActive(window));
 +    window->requestActivate();
++    QVERIFY(QTest::qWaitForWindowActive(window.data()));
 +
 +    QQuickItem *contentItem = window->contentItem();
 +    QVERIFY(contentItem);
 +    QQuickItem *rootItem = contentItem->childItems().first();
 +    QVERIFY(rootItem);
 +
 +    // the window becomes active
 +    QAccessible::State activatedChange;
 +    activatedChange.active = true;
  
-     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(window);
+     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(window.data());
      QVERIFY(iface);
      QAccessibleInterface *root = iface->child(0);
  

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