Clear the chain of incubated objects in QQmlIncubatorPrivate::clear

Change-Id: I432310c0e6006d567fd59b4b1021a9e1538ef78f
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index 4c9c99f1f6..480e61b0f4 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -169,6 +169,20 @@ void QQmlIncubatorPrivate::clear()
         nextWaitingFor.remove();
         waitingOnMe = 0;
     }
+
+    // if we're waiting on any incubators then they should be cleared too.
+    while (waitingFor.first()) {
+        QQmlIncubator * i = static_cast<QQmlIncubatorPrivate*>(waitingFor.first())->q;
+        if (i)
+            i->clear();
+    }
+
+    bool guardOk = vmeGuard.isOK();
+
+    vmeGuard.clear();
+    if (creator && guardOk)
+        creator->clear();
+    creator.reset(0);
 }
 
 /*!
@@ -562,20 +576,6 @@ void QQmlIncubator::clear()
 
     d->clear();
 
-    // if we're waiting on any incubators then they should be cleared too.
-    while (d->waitingFor.first()) {
-        QQmlIncubator * i = static_cast<QQmlIncubatorPrivate*>(d->waitingFor.first())->q;
-        if (i)
-            i->clear();
-    }
-
-    bool guardOk = d->vmeGuard.isOK();
-
-    d->vmeGuard.clear();
-    if (d->creator && guardOk)
-        d->creator->clear();
-    d->creator.reset(0);
-
     Q_ASSERT(d->compiledData == 0);
     Q_ASSERT(d->waitingOnMe.data() == 0);
     Q_ASSERT(d->waitingFor.isEmpty());