diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-05-08 21:45:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:16 +0200 |
commit | 4632c0bfff911fa84f00aab9721519427cfa9921 (patch) | |
tree | a8513cf53831c554ee45b720abdbde8ed67e4c9b /src/qml/qml/qqmlcontextwrapper_p.h | |
parent | 20224f2152aca440e91ef11644356c9db8d929de (diff) |
Convert context and list wrapper
Change-Id: Ida3ac10092e1fae53f57e2e664f58c6138a17a99
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h index 297d2d009f..a2cb0960d4 100644 --- a/src/qml/qml/qqmlcontextwrapper_p.h +++ b/src/qml/qml/qqmlcontextwrapper_p.h @@ -74,6 +74,8 @@ struct QQmlIdObjectsArray; struct Q_QML_EXPORT QmlContextWrapper : Object { struct Data : Object::Data { + Data(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false); + ~Data(); bool readOnly; bool ownsContext; bool isNullWrapper; @@ -93,8 +95,6 @@ struct Q_QML_EXPORT QmlContextWrapper : Object } __data; V4_OBJECT - QmlContextWrapper(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false); - ~QmlContextWrapper(); static ReturnedValue qmlScope(QV8Engine *e, QQmlContextData *ctxt, QObject *scope); static ReturnedValue urlScope(QV8Engine *e, const QUrl &); @@ -123,6 +123,7 @@ struct Q_QML_EXPORT QmlContextWrapper : Object struct QQmlIdObjectsArray : public Object { struct Data : Object::Data { + Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper); QmlContextWrapper *contextWrapper; }; struct { @@ -130,7 +131,6 @@ struct QQmlIdObjectsArray : public Object } __data; V4_OBJECT - QQmlIdObjectsArray(ExecutionEngine *engine, QmlContextWrapper *contextWrapper); static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty); static void markObjects(Managed *that, ExecutionEngine *engine); |