Merge branch 'dev' of qtdeclarative into wip/v4

Conflicts:
	src/qml/jsruntime/qv4script.cpp

Change-Id: I20136cab29d86862b5bd9208003200bc24bcdacf

1 files changed, 5 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index aef8ac8838..16bab966e9 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -46,6 +46,7 @@
 #include "qv4context_p.h"
 #include "qv4debugging_p.h"
 #include "qv4exception_p.h"
+#include "qv4scopedvalue_p.h"
 
 #include <private/qqmljsengine_p.h>
 #include <private/qqmljslexer_p.h>
@@ -74,7 +75,7 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, Function *f, Objec
     scope->engine->popContext();
 }
 
-Value QmlBindingWrapper::call(Managed *that, const CallData &)
+Value QmlBindingWrapper::call(Managed *that, CallData *)
 {
     ExecutionEngine *engine = that->engine();
     QmlBindingWrapper *This = static_cast<QmlBindingWrapper *>(that);
@@ -237,9 +238,9 @@ Value Script::run()
 
     } else {
         FunctionObject *f = new (engine->memoryManager) QmlBindingWrapper(scope, vmFunction, qml.value().asObject());
-        CALLDATA(0);
-        d.thisObject = Value::undefinedValue();
-        return f->call(d);
+        ScopedCallData callData(scope->engine, 0);
+        callData->thisObject = Value::undefinedValue();
+        return f->call(callData);
     }
 }