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/qqmlcontextwrapper.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/qqmlcontextwrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index bbb757797e..c74d9ecd54 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -54,7 +54,7 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(QmlContextWrapper); QmlContextWrapper::Data::Data(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext) - : Object::Data(QV8Engine::getV4(engine)) + : Heap::Object(QV8Engine::getV4(engine)) , readOnly(true) , ownsContext(ownsContext) , isNullWrapper(false) @@ -433,7 +433,7 @@ ReturnedValue QmlContextWrapper::qmlSingletonWrapper(QV8Engine *v8, String *name DEFINE_OBJECT_VTABLE(QQmlIdObjectsArray); QQmlIdObjectsArray::Data::Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper) - : Object::Data(engine) + : Heap::Object(engine) , contextWrapper(contextWrapper) { setVTable(staticVTable()); |