1 files changed, 14 insertions, 22 deletions

diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index eba93bfb1a..963638ca34 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -41,7 +41,6 @@
 #include "qqmlcomponent.h"
 #include "qqmlincubator_p.h"
 
-#include "qqmlcompiler_p.h"
 #include "qqmlexpression_p.h"
 #include "qqmlmemoryprofiler_p.h"
 #include "qqmlobjectcreator_p.h"
@@ -132,7 +131,7 @@ QQmlIncubationController *QQmlEngine::incubationController() const
 
 QQmlIncubatorPrivate::QQmlIncubatorPrivate(QQmlIncubator *q, QQmlIncubator::IncubationMode m)
     : q(q), status(QQmlIncubator::Null), mode(m), isAsynchronous(false), progress(Execute),
-      result(0), compiledData(0), waitingOnMe(0)
+      result(0), enginePriv(0), waitingOnMe(0)
 {
 }
 
@@ -143,20 +142,15 @@ QQmlIncubatorPrivate::~QQmlIncubatorPrivate()
 
 void QQmlIncubatorPrivate::clear()
 {
+    compilationUnit = nullptr;
     if (next.isInList()) {
         next.remove();
-        Q_ASSERT(compiledData);
-        QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(compiledData->engine);
-        compiledData->release();
-        compiledData = 0;
         enginePriv->incubatorCount--;
         QQmlIncubationController *controller = enginePriv->incubationController;
         if (controller)
              controller->incubatingObjectCountChanged(enginePriv->incubatorCount);
-    } else if (compiledData) {
-        compiledData->release();
-        compiledData = 0;
     }
+    enginePriv = 0;
     if (!rootContext.isNull()) {
         rootContext->activeVMEData = 0;
         rootContext = 0;
@@ -212,7 +206,7 @@ public:
     }
 
 protected:
-    virtual void timerEvent(QTimerEvent *) {
+    void timerEvent(QTimerEvent *) override {
         incubateFor(5);
     }
 };
@@ -278,21 +272,20 @@ void QQmlIncubatorPrivate::forceCompletion(QQmlInstantiationInterrupt &i)
 
 void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i)
 {
-    if (!compiledData)
+    if (!compilationUnit)
         return;
 
-    QML_MEMORY_SCOPE_URL(compiledData->compilationUnit->url());
+    QML_MEMORY_SCOPE_URL(compilationUnit->url());
 
     QExplicitlySharedDataPointer<QQmlIncubatorPrivate> protectThis(this);
 
     QRecursionWatcher<QQmlIncubatorPrivate, &QQmlIncubatorPrivate::recursion> watcher(this);
-
-    QQmlEngine *engine = compiledData->engine;
-    QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(engine);
+    // get a copy of the engine pointer as it might get reset;
+    QQmlEnginePrivate *enginePriv = this->enginePriv;
 
     if (!vmeGuard.isOK()) {
         QQmlError error;
-        error.setUrl(compiledData->compilationUnit->url());
+        error.setUrl(compilationUnit->url());
         error.setDescription(QQmlComponent::tr("Object destroyed during incubation"));
         errors << error;
         progress = QQmlIncubatorPrivate::Completed;
@@ -440,7 +433,7 @@ example shows a simple use of QQmlIncubator.
 QQmlIncubator incubator;
 component->create(incubator);
 
-while (incubator.isReady()) {
+while (!incubator.isReady()) {
     QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
 }
 
@@ -563,17 +556,16 @@ void QQmlIncubator::clear()
     if (s == Null)
         return;
 
-    QQmlEnginePrivate *enginePriv = 0;
+    QQmlEnginePrivate *enginePriv = d->enginePriv;
     if (s == Loading) {
-        Q_ASSERT(d->compiledData);
-        enginePriv = QQmlEnginePrivate::get(d->compiledData->engine);
+        Q_ASSERT(d->compilationUnit);
         if (d->result) d->result->deleteLater();
         d->result = 0;
     }
 
     d->clear();
 
-    Q_ASSERT(d->compiledData == 0);
+    Q_ASSERT(d->compilationUnit.isNull());
     Q_ASSERT(d->waitingOnMe.data() == 0);
     Q_ASSERT(d->waitingFor.isEmpty());
 
@@ -713,7 +705,7 @@ QQmlIncubator::Status QQmlIncubatorPrivate::calculateStatus() const
         return QQmlIncubator::Error;
     else if (result && progress == QQmlIncubatorPrivate::Completed && waitingFor.isEmpty())
         return QQmlIncubator::Ready;
-    else if (compiledData)
+    else if (compilationUnit)
         return QQmlIncubator::Loading;
     else
         return QQmlIncubator::Null;