From 7d4fc70e70ca566900c01aa7c5e3ec4770d15933 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 20 Jan 2014 13:51:00 +0100 Subject: Split ManagedVTable into two classes Keep the basic methods in ManagedVTable, but have the Object related stuff in an ObjectVTable class. Change-Id: I9b068acf3caef813686227b8d935e7df1a7d1a6e Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlcomponent.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/qml/qqmlcomponent.cpp') diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 5813415347..a36150ee42 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1069,7 +1069,7 @@ class QQmlComponentIncubator; class QmlIncubatorObject : public QV4::Object { - Q_MANAGED + V4_OBJECT public: QmlIncubatorObject(QV8Engine *engine, QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous); @@ -1093,7 +1093,7 @@ public: void setInitialState(QObject *); }; -DEFINE_MANAGED_VTABLE(QmlIncubatorObject); +DEFINE_OBJECT_VTABLE(QmlIncubatorObject); class QQmlComponentIncubator : public QQmlIncubator { @@ -1467,7 +1467,7 @@ QmlIncubatorObject::QmlIncubatorObject(QV8Engine *engine, QQmlIncubator::Incubat { incubator.reset(new QQmlComponentIncubator(this, m)); v8 = engine; - setVTable(&static_vtbl); + setVTable(staticVTable()); valuemap = QV4::Primitive::undefinedValue(); qmlGlobal = QV4::Primitive::undefinedValue(); -- cgit v1.2.3