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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h index 5f2229fe51..e3a1d9b508 100644 --- a/src/qml/qml/qqmlcontextwrapper_p.h +++ b/src/qml/qml/qqmlcontextwrapper_p.h @@ -65,7 +65,7 @@ struct QQmlIdObjectsArray; struct Q_QML_EXPORT QmlContextWrapper : Object { - struct Data : Object::Data { + struct Data : Heap::Object { Data(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false); ~Data(); bool readOnly; @@ -104,7 +104,7 @@ struct Q_QML_EXPORT QmlContextWrapper : Object struct QQmlIdObjectsArray : public Object { - struct Data : Object::Data { + struct Data : Heap::Object { Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper); QmlContextWrapper *contextWrapper; }; |