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

Conflicts:
	src/qml/jsruntime/qv4functionobject.cpp
	src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h

Change-Id: Id164f6c3b45501aa466908659ec4e3b957323753

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

diff --cc src/qml/jsruntime/qv4functionobject.cpp
index 58e0277,6c596ff..fb87822
--- 1/src/qml/jsruntime/qv4functionobject.cpp
--- 2/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@@ -447,6 -448,9 +447,9 @@@ ReturnedValue ScriptFunction::construct
      callData->thisObject = obj.asReturnedValue();
      ExecutionContext *ctx = context->newCallContext(f.getPointer(), callData);
  
 -    ScopedValue result(scope, f->function->code(ctx, f->function->codeData));
+     ExecutionContextSaver ctxSaver(context);
++    ScopedValue result(scope, Q_V4_PROFILE(v4, ctx, f->function));
+ 
      if (f->function->compiledFunction->hasQmlDependencies())
          QmlContextWrapper::registerQmlDependencies(v4, f->function->compiledFunction);
  
@@@ -470,14 -472,16 +471,16 @@@ ReturnedValue ScriptFunction::call(Mana
  
      CallContext *ctx = context->newCallContext(f, callData);
  
 -    ScopedValue result(scope, f->function->code(ctx, f->function->codeData));
+     ExecutionContextSaver ctxSaver(context);
++    ScopedValue result(scope, Q_V4_PROFILE(v4, ctx, f->function));
+ 
      if (f->function->compiledFunction->hasQmlDependencies())
          QmlContextWrapper::registerQmlDependencies(ctx->engine, f->function->compiledFunction);
  
-     ExecutionContextSaver ctxSaver(context);
-     return Q_V4_PROFILE(v4, ctx, f->function);
+     return result.asReturnedValue();
  }
  
 -DEFINE_MANAGED_VTABLE(SimpleScriptFunction);
 +DEFINE_OBJECT_VTABLE(SimpleScriptFunction);
  
  SimpleScriptFunction::SimpleScriptFunction(ExecutionContext *scope, Function *function)
      : FunctionObject(scope, function->name, true)
@@@ -542,6 -546,8 +545,8 @@@ ReturnedValue SimpleScriptFunction::con
      }
      Q_ASSERT(v4->currentContext() == &ctx);
  
 -    Scoped<Object> result(scope, f->function->code(&ctx, f->function->codeData));
++    Scoped<Object> result(scope, Q_V4_PROFILE(v4, &ctx, f->function));
+ 
      if (f->function->compiledFunction->hasQmlDependencies())
          QmlContextWrapper::registerQmlDependencies(v4, f->function->compiledFunction);
  
@@@ -579,6 -583,8 +582,8 @@@ ReturnedValue SimpleScriptFunction::cal
      }
      Q_ASSERT(v4->currentContext() == &ctx);
  
 -    ScopedValue result(scope, f->function->code(&ctx, f->function->codeData));
++    ScopedValue result(scope, Q_V4_PROFILE(v4, &ctx, f->function));
+ 
      if (f->function->compiledFunction->hasQmlDependencies())
          QmlContextWrapper::registerQmlDependencies(v4, f->function->compiledFunction);
  

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

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

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

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

diff --cc src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index c38c483,128ae27..7c06de7
--- 1/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
--- 2/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@@ -371,7 -371,7 +371,7 @@@ public
          float lastOpacity;
      };
  
-     ShaderManager() : blitProgram(0), visualizeProgram(0) { }
 -    ShaderManager(QSGRenderContext *ctx) : blitProgram(0), context(ctx) { }
++    ShaderManager(QSGRenderContext *ctx) : blitProgram(0), visualizeProgram(0), context(ctx) { }
      ~ShaderManager() {
          qDeleteAll(rewrittenShaders.values());
          qDeleteAll(stockShaders.values());
@@@ -388,7 -388,7 +388,8 @@@ public
      QHash<QSGMaterialType *, Shader *> stockShaders;
  
      QOpenGLShaderProgram *blitProgram;
 +    QOpenGLShaderProgram *visualizeProgram;
+     QSGRenderContext *context;
  };
  
  class Q_QUICK_PRIVATE_EXPORT Renderer : public QSGRenderer

diff --cc src/quick/scenegraph/coreapi/qsgrenderer_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 tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
Simple merge