Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD

Conflicts:
	src/qml/compiler/qv4isel_masm.cpp
	src/qml/jsruntime/qv4script.cpp
	src/qml/qml/qml.pri
	src/qml/qml/qqmltypeloader_p.h

Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index b00e076a2b..5a880fee88 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -56,7 +56,7 @@ struct QmlBindingWrapper : FunctionObject {
 
     QmlBindingWrapper(ExecutionContext *scope, Function *f, Object *qml);
 
-    static Value call(Managed *that, CallData *);
+    static ReturnedValue call(Managed *that, CallData *);
     static void markObjects(Managed *m);
 
 private:
@@ -88,13 +88,13 @@ struct Q_QML_EXPORT Script {
     bool parseAsBinding;
 
     void parse();
-    Value run();
-    Value qmlBinding();
+    ReturnedValue run();
+    ReturnedValue qmlBinding();
 
     Function *function();
 
 
-    static Value evaluate(ExecutionEngine *engine, const QString &script, Object *scopeObject);
+    static ReturnedValue evaluate(ExecutionEngine *engine, const QString &script, Object *scopeObject);
 };
 
 }