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

Conflicts:
	src/qml/jsruntime/qv4errorobject_p.h

Change-Id: I7fc1211295738a9fae32b783a9f001f1613785e4

diff --cc src/qml/jsruntime/qv4errorobject_p.h
index bb31b50,47442ad..ffbdafc
--- 1/src/qml/jsruntime/qv4errorobject_p.h
--- 2/src/qml/jsruntime/qv4errorobject_p.h
+++ b/src/qml/jsruntime/qv4errorobject_p.h
@@@ -70,8 -70,8 +70,8 @@@ struct ErrorObject: Object 
      SyntaxErrorObject *asSyntaxError();
  
      static ReturnedValue method_get_stack(CallContext *ctx);
 -    static void markObjects(Managed *that, ExecutionEngine *e);
 +    static void markObjects(HeapObject *that, ExecutionEngine *e);
-     static void destroy(Managed *that) { static_cast<ErrorObject *>(that)->~ErrorObject(); }
+     static void destroy(Managed *that) { static_cast<ErrorObject *>(that)->d()->~Data(); }
  };
  
  template<>

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

diff --cc src/qml/qml/qqmllocale_p.h
Simple merge

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