diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-20 18:55:49 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-21 09:59:45 +0200 |
commit | 61902215393c27041739d4cd8544e502ca7f8270 (patch) | |
tree | 252e39f79a1b1353ad1e48b3d7e32bc47a4af43d /src/qml/qml/qqmlboundsignal.cpp | |
parent | c7c6f955df2733f4ded7340c073ce418c15c30e9 (diff) |
Move QQmlJavascriptExression::evaluate over to v4
Change-Id: Ic4093dc5413f43af55a74a0e0f8c316ac1c6d974
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal.cpp')
-rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 44c1c52afa..761636a1aa 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -225,7 +225,7 @@ void QQmlBoundSignalExpression::evaluate(void **a) int *argsTypes = QQmlPropertyCache::methodParameterTypes(m_target, methodIndex, dummy, 0); int argCount = argsTypes ? m_parameterCountForJS : 0; - QVarLengthArray<v8::Handle<v8::Value>, 9> args(argCount); + QVarLengthArray<QV4::Value, 9> args(argCount); for (int ii = 0; ii < argCount; ++ii) { int type = argsTypes[ii + 1]; @@ -236,7 +236,7 @@ void QQmlBoundSignalExpression::evaluate(void **a) args[ii] = engine->fromVariant(*((QVariant *)a[ii + 1])); } else if (type == QMetaType::Int) { //### optimization. Can go away if we switch to metaTypeToJS, or be expanded otherwise - args[ii] = v8::Integer::New(*reinterpret_cast<const int*>(a[ii + 1])); + args[ii] = QV4::Value::fromInt32(*reinterpret_cast<const int*>(a[ii + 1])); } else if (type == qMetaTypeId<QQmlV4Handle>()) { args[ii] = reinterpret_cast<QQmlV4Handle *>(a[ii + 1])->toValue(); } else if (ep->isQObject(type)) { |