1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h
index 21ee30acd0..bef58b8c9a 100644
--- a/src/qml/qml/qqmlobjectcreator_p.h
+++ b/src/qml/qml/qqmlobjectcreator_p.h
@@ -123,7 +123,7 @@ private:
 
     void registerObjectWithContextById(const QV4::CompiledData::Object *object, QObject *instance) const;
 
-    inline QV4::Heap::QmlContext *currentQmlContext();
+    inline QV4::QmlContext *currentQmlContext();
     Q_NEVER_INLINE void createQmlContext();
 
     enum Phase {
@@ -174,12 +174,12 @@ private:
     QRecursionWatcher<QQmlObjectCreatorSharedState, &QQmlObjectCreatorSharedState::recursionNode> watcher;
 };
 
-QV4::Heap::QmlContext *QQmlObjectCreator::currentQmlContext()
+QV4::QmlContext *QQmlObjectCreator::currentQmlContext()
 {
-    if (Q_UNLIKELY(!_qmlContext->isManaged()))
-        createQmlContext(); // less common slow path
+    if (!_qmlContext->isManaged())
+        _qmlContext->setM(QV4::QmlContext::create(v4->rootContext(), context, _scopeObject));
 
-    return _qmlContext->d();
+    return _qmlContext;
 }
 
 QT_END_NAMESPACE