From 61902215393c27041739d4cd8544e502ca7f8270 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 20 May 2013 18:55:49 +0200 Subject: Move QQmlJavascriptExression::evaluate over to v4 Change-Id: Ic4093dc5413f43af55a74a0e0f8c316ac1c6d974 Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlboundsignal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlboundsignal.cpp') 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, 9> args(argCount); + QVarLengthArray 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(a[ii + 1])); + args[ii] = QV4::Value::fromInt32(*reinterpret_cast(a[ii + 1])); } else if (type == qMetaTypeId()) { args[ii] = reinterpret_cast(a[ii + 1])->toValue(); } else if (ep->isQObject(type)) { -- cgit v1.2.3