diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-10-06 17:33:39 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 04:26:50 +0200 |
commit | d517e9c541e5869e87006faeccd60be5690bee5b (patch) | |
tree | faf429942478baa9bf11fa7cad6a63153b6bfaa7 /src/declarative/qml/qdeclarativevme_p.h | |
parent | ff79fc671407c2457edee1b0a3404928897e6948 (diff) |
QDeclarativeIncubator autotests
Change-Id: I5c4594c40fccfe6cb8b198a5fd6c11b468b0562e
Reviewed-on: http://codereview.qt-project.org/6118
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativevme_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativevme_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h index 5809ccc12c..19db2ef217 100644 --- a/src/declarative/qml/qdeclarativevme_p.h +++ b/src/declarative/qml/qdeclarativevme_p.h @@ -119,7 +119,8 @@ public: QDeclarativeComponentAttached *componentAttached; QList<QDeclarativeEnginePrivate::FinalizeCallback> finalizeCallbacks; - void init(QDeclarativeContextData *, QDeclarativeCompiledData *, int start); + void init(QDeclarativeContextData *, QDeclarativeCompiledData *, int start, + QDeclarativeContextData * = 0); bool initDeferred(QObject *); void reset(); @@ -150,6 +151,7 @@ private: QFiniteStack<QDeclarativeAbstractBinding *> bindValues; QFiniteStack<QDeclarativeParserStatus *> parserStatus; QDeclarativeGuardedContextData rootContext; + QDeclarativeGuardedContextData creationContext; struct State { enum Flag { Deferred = 0x00000001 }; |