Fix return value for QQmlJavascriptExpression::evaluate

Change-Id: Idf95ee51b7d50682476371c7f49537930fdf96f1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index b1c68ca..7aa7234 100644 (file)
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -107,14 +107,14 @@ void QQmlJavaScriptExpression::resetNotifyOnValueChanged()
     clearGuards();
 }
 
-v8::Handle<v8::Value>
+QV4::Value
 QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
                                    const QV4::Value &function, bool *isUndefined)
 {
     return evaluate(context, function, 0, 0, isUndefined);
 }
 
-v8::Handle<v8::Value>
+QV4::Value
 QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
                                    const QV4::Value &function,
                                    int argc, QV4::Value *args,

diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index 9888812..be14681 100644 (file)
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -109,9 +109,9 @@ public:
 
     QQmlJavaScriptExpression(VTable *vtable);
 
-    v8::Handle<v8::Value> evaluate(QQmlContextData *, const QV4::Value &function,
+    QV4::Value evaluate(QQmlContextData *, const QV4::Value &function,
                                   bool *isUndefined);
-    v8::Handle<v8::Value> evaluate(QQmlContextData *, const QV4::Value &function,
+    QV4::Value evaluate(QQmlContextData *, const QV4::Value &function,
                                   int argc, QV4::Value *args,
                                   bool *isUndefined);