4 files changed, 8 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index eb4f590222..16c41a8950 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1051,6 +1051,7 @@ void QQmlComponent::create(QQmlIncubator &incubator, QQmlContext *context,
 
     p->compiledData = d->cc;
     p->compiledData->addref();
+    p->enginePriv = enginePriv;
     p->creator.reset(new QQmlObjectCreator(contextData, d->cc, d->creationContext, p.data()));
     p->subComponentToCreate = d->start;
 
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index eba93bfb1a..d0991f51fe 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -132,7 +132,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), compiledData(0), waitingOnMe(0)
 {
 }
 
@@ -146,7 +146,6 @@ void QQmlIncubatorPrivate::clear()
     if (next.isInList()) {
         next.remove();
         Q_ASSERT(compiledData);
-        QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(compiledData->engine);
         compiledData->release();
         compiledData = 0;
         enginePriv->incubatorCount--;
@@ -157,6 +156,7 @@ void QQmlIncubatorPrivate::clear()
         compiledData->release();
         compiledData = 0;
     }
+    enginePriv = 0;
     if (!rootContext.isNull()) {
         rootContext->activeVMEData = 0;
         rootContext = 0;
@@ -286,9 +286,8 @@ void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i)
     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;
@@ -563,10 +562,9 @@ 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);
         if (d->result) d->result->deleteLater();
         d->result = 0;
     }
diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h
index a12ff9c5e2..974a353f77 100644
--- a/src/qml/qml/qqmlincubator_p.h
+++ b/src/qml/qml/qqmlincubator_p.h
@@ -85,6 +85,7 @@ public:
 
     QPointer<QObject> result;
     QQmlGuardedContextData rootContext;
+    QQmlEnginePrivate *enginePriv;
     QQmlCompiledData *compiledData;
     QScopedPointer<QQmlObjectCreator> creator;
     int subComponentToCreate;
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index aee9fcd0a2..05408b525a 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -1921,6 +1921,7 @@ void QQmlDelegateModelItem::incubateObject(
 
     incubatorPriv->compiledData = componentPriv->cc;
     incubatorPriv->compiledData->addref();
+    incubatorPriv->enginePriv = enginePriv;
     incubatorPriv->creator.reset(new QQmlObjectCreator(context, componentPriv->cc, componentPriv->creationContext));
     incubatorPriv->subComponentToCreate = componentPriv->start;