diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-03-19 17:37:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 10:49:39 +0100 |
| commit | af3a8708b46e8ae6e177dcee028364bd9fd285cd (patch) | |
| tree | 1ae7bf29edb1e7f92a2b8bf4048c0acd1b7312bc /src/qml/qml/qqmlincubator.cpp | |
| parent | 6deb3ceffa209d710570ffeb361e95c988e6e7cd (diff) | |
When clearing an incubator also clear incubators it is waiting for.
If an incubator is cleared while waiting for other incubators
to complete also clear the incubators it is waiting for.
Change-Id: I83470920c0fd8a23d0098849192555f7478bb492
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlincubator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlincubator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp index c8413f70ca..aa9777d89e 100644 --- a/src/qml/qml/qqmlincubator.cpp +++ b/src/qml/qml/qqmlincubator.cpp @@ -542,6 +542,10 @@ void QQmlIncubator::clear() d->clear(); + // if we're waiting on any incubators then they should be cleared too. + while (d->waitingFor.first()) + static_cast<QQmlIncubatorPrivate*>(d->waitingFor.first())->q->clear(); + d->vme.reset(); d->vmeGuard.clear(); |