diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-11-01 10:05:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 13:09:31 +0100 |
| commit | f75bd7eb78759a2b708771517b5fc64fd7a75e8a (patch) | |
| tree | 3e71ed39482f9272afbc6feea2d6cf94b5555e48 /src/declarative/qml/qdeclarativecontext_p.h | |
| parent | c29b3c0974383dfe5e2b4890b5d6377d5aa4264e (diff) | |
Ensure that chained incubation works from componentCompleted.
Make chained AsynchronousIfNested initiated from componentComplete
work correctly, i.e. asynchronous incubator is not Ready until
all chained creation is Ready.
Change-Id: I286cc10e2f09e36dcc6034f3f23681e833d7e6e8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index ba4edb8e15..a6e83a0692 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -146,9 +146,8 @@ public: quint32 dummy:28; QDeclarativeContext *publicContext; - // VME that is constructing this context if any - // XXX remove if possible - QDeclarativeVME *activeVME; + // VME data that is constructing this context if any + void *activeVMEData; // Property name cache QDeclarativeIntegerCache *propertyNames; |