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

Conflicts:
	.qmake.conf
	src/imports/dialogs/DefaultFileDialog.qml
	src/imports/widgets/qquickqfiledialog.cpp

Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd

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

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

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

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

diff --cc src/qml/jsruntime/qv4functionobject.cpp
index a1673df,ce81282..daa3d5b
--- 1/src/qml/jsruntime/qv4functionobject.cpp
--- 2/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@@ -129,11 -130,9 +129,8 @@@ void FunctionObject::init(const StringR
      Scope s(internalClass->engine);
      ScopedValue protectThis(s, this);
  
 -    type = Type_FunctionObject;
      needsActivation = true;
      strictMode = false;
- #ifndef QT_NO_DEBUG
-      assert(scope->next != (ExecutionContext *)0x1);
- #endif
  
      if (createProto) {
          Scoped<Object> proto(s, scope->engine->newObject(scope->engine->protoClass));

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

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

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

diff --cc tests/auto/quick/qquickview/tst_qquickview.cpp
Simple merge