3 files changed, 17 insertions, 8 deletions

diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index 82c1b3a6ae..72c66448b4 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -58,16 +58,16 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_OBJECT_VTABLE(QQuickRootItemMarker);
 
-QQuickRootItemMarker::QQuickRootItemMarker(QQuickViewPrivate *view)
-    : QV4::Object(QQmlEnginePrivate::getV4Engine(view->engine.data()))
-    , view(view)
+QQuickRootItemMarker::QQuickRootItemMarker(QQmlEngine *engine, QQuickWindow *window)
+    : QV4::Object(QQmlEnginePrivate::getV4Engine(engine))
+    , window(window)
 {
     setVTable(staticVTable());
 }
 
 void QQuickRootItemMarker::markObjects(QV4::Managed *that, QV4::ExecutionEngine *e)
 {
-    QQuickItem *root = static_cast<QQuickRootItemMarker*>(that)->view->root;
+    QQuickItem *root = static_cast<QQuickRootItemMarker*>(that)->window->contentItem();
     if (root) {
         QQuickItemPrivate *rootPrivate = QQuickItemPrivate::get(root);
         rootPrivate->markObjects(e);
@@ -91,7 +91,7 @@ void QQuickViewPrivate::init(QQmlEngine* e)
     {
         QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine.data());
         QV4::Scope scope(v4);
-        QV4::Scoped<QQuickRootItemMarker> v(scope, new (v4->memoryManager) QQuickRootItemMarker(this));
+        QV4::Scoped<QQuickRootItemMarker> v(scope, new (v4->memoryManager) QQuickRootItemMarker(engine.data(), q));
         rootItemMarker = v;
     }
 
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 74e40081e9..dfc8c21d0b 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -106,7 +106,7 @@ struct QQuickRootItemMarker : public QV4::Object
 {
     V4_OBJECT
 
-    QQuickRootItemMarker(QQuickViewPrivate *view);
+    QQuickRootItemMarker(QQmlEngine *engine, QQuickWindow *window);
 
     static void destroy(Managed *that)
     {
@@ -115,7 +115,7 @@ struct QQuickRootItemMarker : public QV4::Object
 
     static void markObjects(Managed *that, QV4::ExecutionEngine *e);
 
-    QQuickViewPrivate *view;
+    QQuickWindow *window;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index 3bd62d21db..d06fff8c3e 100644
--- a/src/quick/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -41,6 +41,7 @@
 
 #include "qquickwindowmodule_p.h"
 #include "qquickscreen_p.h"
+#include "qquickview_p.h"
 #include <QtQuick/QQuickWindow>
 #include <QtCore/QCoreApplication>
 #include <QtQml/QQmlEngine>
@@ -91,12 +92,19 @@ Q_SIGNALS:
 
 protected:
     void classBegin() {
+        QQmlEngine* e = qmlEngine(this);
         //Give QQuickView behavior when created from QML with QQmlApplicationEngine
         if (QCoreApplication::instance()->property("__qml_using_qqmlapplicationengine") == QVariant(true)) {
-            QQmlEngine* e = qmlEngine(this);
             if (e && !e->incubationController())
                 e->setIncubationController(incubationController());
         }
+        Q_ASSERT(e);
+        {
+            QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(e);
+            QV4::Scope scope(v4);
+            QV4::ScopedObject v(scope, new (v4->memoryManager) QQuickRootItemMarker(e, this));
+            rootItemMarker = v;
+        }
     }
 
     void componentComplete() {
@@ -158,6 +166,7 @@ private:
     bool m_complete;
     bool m_visible;
     Visibility m_visibility;
+    QV4::PersistentValue rootItemMarker;
 };
 
 void QQuickWindowModule::defineModule()