diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:50:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:32 +0100 |
| commit | c2da8abde56d2010d3e7cb234570079f06d8a441 (patch) | |
| tree | e3185e7f99c66130d615e855af3435ba102d51a4 /src/qml/qml/qqmlcomponent.cpp | |
| parent | da2396478f04aa66d521e53ff24488e72c87d895 (diff) | |
Move Object::Data into the Heap namespace
Change-Id: I9d30081f71b83bc86f5e5714e23396b18c4d54c5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 0ba72c1641..ddb9633427 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1072,7 +1072,7 @@ class QQmlComponentIncubator; struct QmlIncubatorObject : public QV4::Object { - struct Data : QV4::Object::Data { + struct Data : QV4::Heap::Object { Data(QV8Engine *engine, QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous); QScopedPointer<QQmlComponentIncubator> incubator; QV8Engine *v8; @@ -1470,7 +1470,7 @@ QQmlComponentExtension::~QQmlComponentExtension() } QmlIncubatorObject::Data::Data(QV8Engine *engine, QQmlIncubator::IncubationMode m) - : Object::Data(QV8Engine::getV4(engine)) + : QV4::Heap::Object(QV8Engine::getV4(engine)) , v8(engine) , valuemap(QV4::Primitive::undefinedValue()) , qmlGlobal(QV4::Primitive::undefinedValue()) |