diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-04 02:37:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 10:04:35 +0100 |
| commit | 4a662c21e669e964f9c3b835a91a38c9decf4ad4 (patch) | |
| tree | a3921e3303336b59b59aba386dcf683cc241d087 /src/qml/qml/qqmlobjectcreator_p.h | |
| parent | 4b9a44274563b8cc0a9d98f86893df3f31f01307 (diff) | |
[new compiler] Preliminary support for QQmlIncubator
Just enough to run some unit tests that use QQuickLoader, components are
created instantly.
Change-Id: I1c827aa946d3e2a60ccc220bb79572aca2ed8c96
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 799329d8de..229a7de198 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -143,7 +143,7 @@ public: QmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData); QObject *create(int subComponentIndex = -1, QObject *parent = 0); - void finalize(); + QQmlContextData *finalize(); QQmlComponentAttached *componentAttached; QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks; @@ -170,6 +170,7 @@ private: QLinkedList<QVector<QQmlAbstractBinding*> > allCreatedBindings; QLinkedList<QVector<QQmlParserStatus*> > allParserStatusCallbacks; QQmlCompiledData *compiledData; + QQmlContextData *rootContext; QObject *_qobject; QObject *_qobjectForBindings; |