diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-20 20:32:58 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-21 10:05:42 +0200 |
commit | 71e263abc4c5fe0941c931f6a38b394db75b1027 (patch) | |
tree | 56d63c011d2209fda0efb06fe6f04752ad44edb7 /src/qml | |
parent | b7d79a0c271c9541c96be4028ee76eb304e06bf5 (diff) |
Fix return value for QQmlJavascriptExpression::evaluate
Change-Id: Idf95ee51b7d50682476371c7f49537930fdf96f1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index b1c68caf99..7aa7234197 100644 --- 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 9888812093..be14681569 100644 --- 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); |