From a6c36616b0ccf9c1aeb71d90437c9226ae76fe10 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 31 Dec 2014 13:21:39 +0100 Subject: Move extension mechanism over to use the v4 engine Change-Id: Ib329fc7bcae3c78d962a116f53b2244a71f81228 Reviewed-by: Simon Hausmann --- src/qml/util/qqmladaptormodel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qml/util') diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index 262a6ca01c..580641a4d6 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -46,14 +46,14 @@ QT_BEGIN_NAMESPACE class QQmlAdaptorModelEngineData : public QV8Engine::Deletable { public: - QQmlAdaptorModelEngineData(QV8Engine *engine); + QQmlAdaptorModelEngineData(QV4::ExecutionEngine *v4); ~QQmlAdaptorModelEngineData(); QV4::ExecutionEngine *v4; QV4::PersistentValue listItemProto; }; -V8_DEFINE_EXTENSION(QQmlAdaptorModelEngineData, engineData) +V4_DEFINE_EXTENSION(QQmlAdaptorModelEngineData, engineData) static QV4::ReturnedValue get_index(QV4::CallContext *ctx) { @@ -421,7 +421,7 @@ public: QV4::ReturnedValue get() { if (type->prototype.isUndefined()) { - QQmlAdaptorModelEngineData * const data = engineData(v4->v8Engine); + QQmlAdaptorModelEngineData * const data = engineData(v4); type->initializeConstructor(data); } QV4::Scope scope(v4); @@ -602,7 +602,7 @@ public: QV4::ReturnedValue get() { - QQmlAdaptorModelEngineData *data = engineData(v4->v8Engine); + QQmlAdaptorModelEngineData *data = engineData(v4); QV4::Scope scope(v4); QV4::ScopedObject o(scope, v4->memoryManager->alloc(v4, this)); QV4::ScopedObject p(scope, data->listItemProto.value()); @@ -955,8 +955,8 @@ void QQmlAdaptorModel::objectDestroyed(QObject *) setModel(QVariant(), 0, 0); } -QQmlAdaptorModelEngineData::QQmlAdaptorModelEngineData(QV8Engine *e) - : v4(QV8Engine::getV4(e)) +QQmlAdaptorModelEngineData::QQmlAdaptorModelEngineData(QV4::ExecutionEngine *v4) + : v4(v4) { QV4::Scope scope(v4); QV4::ScopedObject proto(scope, v4->newObject()); -- cgit v1.2.3