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/qdeclarativeengine.cpp | |
| 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/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 1f539ee082..50b5db897c 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -542,6 +542,9 @@ QDeclarativeEngine::~QDeclarativeEngine() // ensure we clean up QObjects with JS ownership d->v8engine()->gc(); + + if (d->incubationController) + d->incubationController->d = 0; } /*! \fn void QDeclarativeEngine::quit() |