From 140eb57413accb41b76a610f8fa888da9cc95b68 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 31 May 2013 16:06:42 +0200 Subject: Clean up more stuff in qv8engine Change-Id: Ia31d5abd4694b1c67115e75f0d0f134a65d4d775 Reviewed-by: Simon Hausmann --- src/qml/qml/v8/qv8qobjectwrapper.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/qml/qml/v8/qv8qobjectwrapper.cpp') diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index 4157f8abc6..4090e9c515 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -513,7 +514,7 @@ static QV4::Value LoadProperty(QV8Engine *engine, QObject *object, if (QQmlValueTypeFactory::isValueType(v.userType())) { if (QQmlValueType *valueType = QQmlValueTypeFactory::valueType(v.userType())) - return engine->newValueType(object, property.coreIndex, valueType); // VariantReference value-type. + return QV4::QmlValueTypeWrapper::create(engine, object, property.coreIndex, valueType); // VariantReference value-type. } return engine->fromVariant(v); @@ -521,13 +522,13 @@ static QV4::Value LoadProperty(QV8Engine *engine, QObject *object, Q_ASSERT(notifier == 0); if (QQmlValueType *valueType = QQmlValueTypeFactory::valueType(property.propType)) - return engine->newValueType(object, property.coreIndex, valueType); + return QV4::QmlValueTypeWrapper::create(engine, object, property.coreIndex, valueType); } else { Q_ASSERT(notifier == 0); // see if it's a sequence type bool succeeded = false; - QV4::Value retn = engine->newSequence(property.propType, object, property.coreIndex, &succeeded); + QV4::Value retn = QV4::SequencePrototype::newSequence(QV8Engine::getV4(engine), property.propType, object, property.coreIndex, &succeeded); if (succeeded) return retn; } -- cgit v1.2.3