Allow one incubator to start in the statusChanged() of another

Change-Id: I91cb7e2a8ecc67f34cdcadc0b71f819c2881e2da
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp
index abd759dcc0..d1afac2d13 100644
--- a/src/declarative/qml/qdeclarativeincubator.cpp
+++ b/src/declarative/qml/qdeclarativeincubator.cpp
@@ -313,13 +313,21 @@ void QDeclarativeIncubatorPrivate::incubate(QDeclarativeVME::Interrupt &i)
 
 finishIncubate:
     if (progress == QDeclarativeIncubatorPrivate::Completed && waitingFor.isEmpty()) {
+        typedef QDeclarativeIncubatorPrivate IP;
+
         QDeclarativeIncubatorPrivate *isWaiting = waitingOnMe;
         clear();
-        if (isWaiting) isWaiting->incubate(i); 
 
-        enginePriv->inProgressCreations--;
+        if (isWaiting) {
+            QRecursionWatcher<IP, &IP::recursion> watcher(isWaiting);
+            changeStatus(calculateStatus());
+            if (!watcher.hasRecursed())
+                isWaiting->incubate(i);
+        } else {
+            changeStatus(calculateStatus());
+        }
 
-        changeStatus(calculateStatus());
+        enginePriv->inProgressCreations--;
 
         if (0 == enginePriv->inProgressCreations) {
             while (enginePriv->erroredBindings) {