Behave correctly when AsynchronousIfNested is nested

When AIN is nested within a synchronous AIN, it should behave
synchronously.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp
index 1417ed466a..abd759dcc0 100644
--- a/src/declarative/qml/qdeclarativeincubator.cpp
+++ b/src/declarative/qml/qdeclarativeincubator.cpp
@@ -72,13 +72,15 @@ void QDeclarativeEnginePrivate::incubate(QDeclarativeIncubator &i, QDeclarativeC
             cctxt = cctxt->parent;
         }
 
-        if (parentIncubator && parentIncubator->mode != QDeclarativeIncubator::Synchronous) {
+        if (parentIncubator && parentIncubator->isAsynchronous) {
             mode = QDeclarativeIncubator::Asynchronous;
             p->waitingOnMe = parentIncubator;
             parentIncubator->waitingFor.insert(p);
         }
     }
 
+    p->isAsynchronous = (mode != QDeclarativeIncubator::Synchronous);
+
     inProgressCreations++;
 
     p->changeStatus(QDeclarativeIncubator::Loading);
@@ -121,8 +123,8 @@ QDeclarativeIncubationController *QDeclarativeEngine::incubationController() con
 
 QDeclarativeIncubatorPrivate::QDeclarativeIncubatorPrivate(QDeclarativeIncubator *q, 
                                                            QDeclarativeIncubator::IncubationMode m)
-: q(q), status(QDeclarativeIncubator::Null), mode(m), progress(Execute), result(0), component(0), 
-  vme(this), waitingOnMe(0)
+: q(q), status(QDeclarativeIncubator::Null), mode(m), isAsynchronous(false), progress(Execute),
+  result(0), component(0), vme(this), waitingOnMe(0)
 {
 }