Merge master into api_changes

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/quick/util/qquickimageprovider.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb

1 files changed, 7 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index 834d4bbb97..aa9777d89e 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -427,14 +427,14 @@ specified IncubationMode.
 
 QQmlIncubator supports three incubation modes:
 \list
-\i Synchronous The creation occurs synchronously.  That is, once the 
+\li Synchronous The creation occurs synchronously.  That is, once the
 QQmlComponent::create() call returns, the incubator will already be in either the
 Error or Ready state.  A synchronous incubator has no real advantage compared to using
 the synchronous creation methods on QQmlComponent directly, but it may simplify an 
 application's implementation to use the same API for both synchronous and asynchronous 
 creations.
 
-\i Asynchronous (default) The creation occurs asynchronously, assuming a 
+\li Asynchronous (default) The creation occurs asynchronously, assuming a
 QQmlIncubatorController is set on the QQmlEngine.  
 
 The incubator will remain in the Loading state until either the creation is complete or an error 
@@ -446,7 +446,7 @@ that are slightly off screen while the list is being scrolled.  If, during async
 the object is needed immediately the QQmlIncubator::forceCompletion() method can be called
 to complete the creation process synchronously.
 
-\i AsynchronousIfNested The creation will occur asynchronously if part of a nested asynchronous 
+\li AsynchronousIfNested The creation will occur asynchronously if part of a nested asynchronous
 creation, or synchronously if not.  
 
 In most scenarios where a QML element or component wants the appearance of a synchronous 
@@ -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();