Remove interim compatibility measures

Also update some variables in qtdeclarative which failed to update
rootItem->contentItem.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3
Reviewed-by: Alan Alpert <416365416c@gmail.com>

13 files changed, 122 insertions, 122 deletions

diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 70efc5eac5..f651655244 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -275,7 +275,7 @@ void tst_examples::sgexamples()
         window->show();
         QVERIFY(QTest::qWaitForWindowExposed(window));
     }
-    root->setParentItem(window->rootItem());
+    root->setParentItem(window->contentItem());
     component.completeCreate();
 
     qApp->processEvents();
@@ -319,7 +319,7 @@ void tst_examples::sgsnippets()
         window->show();
         QVERIFY(QTest::qWaitForWindowExposed(window));
     }
-    root->setParentItem(window->rootItem());
+    root->setParentItem(window->contentItem());
     component.completeCreate();
 
     qApp->processEvents();
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index 247f98702e..7c07a16d51 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -81,7 +81,7 @@ void tst_qquickapplication::active()
     QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
     QVERIFY(item);
     QQuickWindow window;
-    item->setParentItem(window.rootItem());
+    item->setParentItem(window.contentItem());
 
     // not active
     QVERIFY(!item->property("active").toBool());
diff --git a/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp b/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
index 8e13e21f1e..562863b4f3 100644
--- a/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
+++ b/tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
@@ -180,7 +180,7 @@ void tst_QQuickDrag::cleanupTestCase()
 void tst_QQuickDrag::active()
 {
     QQuickWindow window;
-    TestDropTarget dropTarget(window.rootItem());
+    TestDropTarget dropTarget(window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
     QQmlComponent component(&engine);
     component.setData(
@@ -390,7 +390,7 @@ void tst_QQuickDrag::active()
 void tst_QQuickDrag::drop()
 {
     QQuickWindow window;
-    TestDropTarget outerTarget(window.rootItem());
+    TestDropTarget outerTarget(window.contentItem());
     outerTarget.setSize(QSizeF(100, 100));
     outerTarget.acceptAction = Qt::CopyAction;
     TestDropTarget innerTarget(&outerTarget);
@@ -526,7 +526,7 @@ void tst_QQuickDrag::drop()
 void tst_QQuickDrag::move()
 {
     QQuickWindow window;
-    TestDropTarget outerTarget(window.rootItem());
+    TestDropTarget outerTarget(window.contentItem());
     outerTarget.setSize(QSizeF(100, 100));
     TestDropTarget leftTarget(&outerTarget);
     leftTarget.setPos(QPointF(0, 35));
@@ -680,11 +680,11 @@ void tst_QQuickDrag::move()
 void tst_QQuickDrag::parentChange()
 {
     QQuickWindow window1;
-    TestDropTarget dropTarget1(window1.rootItem());
+    TestDropTarget dropTarget1(window1.contentItem());
     dropTarget1.setSize(QSizeF(100, 100));
 
     QQuickWindow window2;
-    TestDropTarget dropTarget2(window2.rootItem());
+    TestDropTarget dropTarget2(window2.contentItem());
     dropTarget2.setSize(QSizeF(100, 100));
 
     QQmlComponent component(&engine);
@@ -704,7 +704,7 @@ void tst_QQuickDrag::parentChange()
     QCOMPARE(evaluate<bool>(item, "Drag.active"), true);
 
     // Verify setting a parent item for an item with an active drag sends an enter event.
-    item->setParentItem(window1.rootItem());
+    item->setParentItem(window1.contentItem());
     QCOMPARE(dropTarget1.enterEvents, 0);
     QCoreApplication::processEvents();
     QCOMPARE(dropTarget1.enterEvents, 1);
@@ -719,7 +719,7 @@ void tst_QQuickDrag::parentChange()
 
     // Changing the parent to an item in another window sends a leave event in the old window
     // and an enter on the new window.
-    item->setParentItem(window2.rootItem());
+    item->setParentItem(window2.contentItem());
     QCOMPARE(dropTarget1.enterEvents, 1);
     QCOMPARE(dropTarget1.moveEvents, 1);
     QCOMPARE(dropTarget1.leaveEvents, 0);
@@ -746,13 +746,13 @@ void tst_QQuickDrag::parentChange()
 
     // Go around again and verify no events if active is false.
     evaluate<void>(item, "Drag.active = false");
-    item->setParentItem(window1.rootItem());
+    item->setParentItem(window1.contentItem());
     QCoreApplication::processEvents();
 
     item->setParentItem(&dropTarget1);
     QCoreApplication::processEvents();
 
-    item->setParentItem(window2.rootItem());
+    item->setParentItem(window2.contentItem());
     QCoreApplication::processEvents();
 
     item->setParentItem(0);
@@ -767,7 +767,7 @@ void tst_QQuickDrag::parentChange()
 void tst_QQuickDrag::hotSpot()
 {
     QQuickWindow window;
-    TestDropTarget dropTarget(window.rootItem());
+    TestDropTarget dropTarget(window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
     QQmlComponent component(&engine);
     component.setData(
@@ -831,7 +831,7 @@ void tst_QQuickDrag::hotSpot()
 void tst_QQuickDrag::supportedActions()
 {
     QQuickWindow window;
-    TestDropTarget dropTarget(window.rootItem());
+    TestDropTarget dropTarget(window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
     QQmlComponent component(&engine);
     component.setData(
@@ -889,7 +889,7 @@ void tst_QQuickDrag::supportedActions()
 void tst_QQuickDrag::proposedAction()
 {
     QQuickWindow window;
-    TestDropTarget dropTarget(window.rootItem());
+    TestDropTarget dropTarget(window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
     QQmlComponent component(&engine);
     component.setData(
@@ -958,8 +958,8 @@ void tst_QQuickDrag::keys()
 
     // Test changing the keys restarts a drag.
     QQuickWindow window;
-    item->setParentItem(window.rootItem());
-    TestDropTarget dropTarget(window.rootItem());
+    item->setParentItem(window.contentItem());
+    TestDropTarget dropTarget(window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
 
     evaluate<void>(item, "Drag.start()");
@@ -1006,8 +1006,8 @@ void tst_QQuickDrag::source()
 
     // Test changing the source restarts a drag.
     QQuickWindow window;
-    item->setParentItem(window.rootItem());
-    TestDropTarget dropTarget(window.rootItem());
+    item->setParentItem(window.contentItem());
+    TestDropTarget dropTarget(window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
 
     evaluate<void>(item, "Drag.start()");
@@ -1183,7 +1183,7 @@ void tst_QQuickDrag::recursion()
         QTest::ignoreMessage(QtWarningMsg, warning.constData());
 
     QQuickWindow window;
-    RecursingDropTarget dropTarget(script, type, window.rootItem());
+    RecursingDropTarget dropTarget(script, type, window.contentItem());
     dropTarget.setSize(QSizeF(100, 100));
     QQmlComponent component(&engine);
     component.setData(
@@ -1195,7 +1195,7 @@ void tst_QQuickDrag::recursion()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *item = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(item);
-    item->setParentItem(window.rootItem());
+    item->setParentItem(window.contentItem());
 
     dropTarget.setItem(item);
 
diff --git a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp
index 42dc6ff698..927a57b296 100644
--- a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp
+++ b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp
@@ -122,7 +122,7 @@ void tst_QQuickDropArea::containsDrag_internal()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QQuickItem *dragItem = dropArea->findChild<QQuickItem *>("dragItem");
     QVERIFY(dragItem);
@@ -188,7 +188,7 @@ void tst_QQuickDropArea::containsDrag_external()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QMimeData data;
     QQuickWindow alternateWindow;
@@ -256,7 +256,7 @@ void tst_QQuickDropArea::keys_internal()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QQuickItem *dragItem = dropArea->findChild<QQuickItem *>("dragItem");
     QVERIFY(dragItem);
@@ -356,7 +356,7 @@ void tst_QQuickDropArea::keys_external()
             "}", QUrl());
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QMimeData data;
     QQuickWindow alternateWindow;
@@ -463,7 +463,7 @@ void tst_QQuickDropArea::source_internal()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QQuickItem *dragItem = dropArea->findChild<QQuickItem *>("dragItem");
     QVERIFY(dragItem);
@@ -528,7 +528,7 @@ void tst_QQuickDropArea::position_internal()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QQuickItem *dragItem = dropArea->findChild<QQuickItem *>("dragItem");
     QVERIFY(dragItem);
@@ -590,7 +590,7 @@ void tst_QQuickDropArea::position_external()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QMimeData data;
 
@@ -667,7 +667,7 @@ void tst_QQuickDropArea::drop_internal()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea);
-    dropArea->setParentItem(window.rootItem());
+    dropArea->setParentItem(window.contentItem());
 
     QQuickItem *dragItem = dropArea->findChild<QQuickItem *>("dragItem");
     QVERIFY(dragItem);
@@ -806,7 +806,7 @@ void tst_QQuickDropArea::simultaneousDrags()
     QScopedPointer<QObject> object(component.create());
     QQuickItem *dropArea1 = qobject_cast<QQuickItem *>(object.data());
     QVERIFY(dropArea1);
-    dropArea1->setParentItem(window.rootItem());
+    dropArea1->setParentItem(window.contentItem());
 
     QQuickItem *dropArea2 = dropArea1->findChild<QQuickItem *>("dropArea2");
     QVERIFY(dropArea2);
diff --git a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
index 1cf07d38b6..a614bbbe42 100644
--- a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
+++ b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
@@ -503,7 +503,7 @@ void tst_qquickfocusscope::canvasFocus()
     QQuickItem *rootObject = view->rootObject();
     QVERIFY(rootObject);
 
-    QQuickItem *rootItem = view->rootItem();
+    QQuickItem *rootItem = view->contentItem();
     QQuickItem *scope1 = findItem<QQuickItem>(rootObject, QLatin1String("scope1"));
     QQuickItem *item1 = findItem<QQuickItem>(rootObject, QLatin1String("item1"));
     QQuickItem *scope2 = findItem<QQuickItem>(rootObject, QLatin1String("scope2"));
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index f98fe752c3..1050308afd 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -254,7 +254,7 @@ struct FocusState : public QHash<QQuickItem *, FocusData>
             else if (qobject_cast<TestFocusScope *>(window.activeFocusItem())) \
                 QCOMPARE(qobject_cast<TestFocusScope *>(window.activeFocusItem())->focused, true); \
         } else { \
-            QCOMPARE(window.activeFocusItem(), window.rootItem()); \
+            QCOMPARE(window.activeFocusItem(), window.contentItem()); \
         } \
         for (QHash<QQuickItem *, FocusData>::Iterator iter = focusState.begin(); \
             iter != focusState.end(); \
@@ -276,9 +276,9 @@ void tst_qquickitem::simpleFocus()
 
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
 
-    QQuickItem *l1c1 = new TestItem(window.rootItem());
-    QQuickItem *l1c2 = new TestItem(window.rootItem());
-    QQuickItem *l1c3 = new TestItem(window.rootItem());
+    QQuickItem *l1c1 = new TestItem(window.contentItem());
+    QQuickItem *l1c2 = new TestItem(window.contentItem());
+    QQuickItem *l1c3 = new TestItem(window.contentItem());
 
     QQuickItem *l2c1 = new TestItem(l1c1);
     QQuickItem *l2c2 = new TestItem(l1c1);
@@ -327,9 +327,9 @@ void tst_qquickitem::scopedFocus()
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
 
-    QQuickItem *l1c1 = new TestItem(window.rootItem());
-    QQuickItem *l1c2 = new TestItem(window.rootItem());
-    QQuickItem *l1c3 = new TestItem(window.rootItem());
+    QQuickItem *l1c1 = new TestItem(window.contentItem());
+    QQuickItem *l1c2 = new TestItem(window.contentItem());
+    QQuickItem *l1c3 = new TestItem(window.contentItem());
 
     QQuickItem *l2c1 = new TestItem(l1c1);
     QQuickItem *l2c2 = new TestItem(l1c1);
@@ -416,7 +416,7 @@ void tst_qquickitem::addedToWindow()
     focusState[item].set(true, false);
     FVERIFY();
 
-    item->setParentItem(window.rootItem());
+    item->setParentItem(window.contentItem());
     focusState[item].set(true, true);
     focusState.active(item);
     FVERIFY();
@@ -427,7 +427,7 @@ void tst_qquickitem::addedToWindow()
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
 
-    QQuickItem *item = new TestItem(window.rootItem());
+    QQuickItem *item = new TestItem(window.contentItem());
 
     QQuickItem *tree = new TestItem;
     QQuickItem *c1 = new TestItem(tree);
@@ -468,7 +468,7 @@ void tst_qquickitem::addedToWindow()
     focusState[c2].set(true, false);
     FVERIFY();
 
-    tree->setParentItem(window.rootItem());
+    tree->setParentItem(window.contentItem());
     focusState[c1].set(false, false);
     focusState[c2].set(true, true);
     focusState.active(c2);
@@ -491,7 +491,7 @@ void tst_qquickitem::addedToWindow()
     focusState[c2].set(true, false);
     FVERIFY();
 
-    tree->setParentItem(window.rootItem());
+    tree->setParentItem(window.contentItem());
     focusState[c1].set(false, false);
     focusState[c2].set(true, false);
     FVERIFY();
@@ -521,7 +521,7 @@ void tst_qquickitem::addedToWindow()
     focusState[c2].set(true, false);
     FVERIFY();
 
-    tree->setParentItem(window.rootItem());
+    tree->setParentItem(window.contentItem());
     focusState[tree].set(true, true);
     focusState[c1].set(false, false);
     focusState[c2].set(true, true);
@@ -533,7 +533,7 @@ void tst_qquickitem::addedToWindow()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *child = new TestItem(window.rootItem());
+    QQuickItem *child = new TestItem(window.contentItem());
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
     QQuickItem *c2 = new TestItem(tree);
@@ -551,7 +551,7 @@ void tst_qquickitem::addedToWindow()
     focusState.active(child);
     FVERIFY();
 
-    tree->setParentItem(window.rootItem());
+    tree->setParentItem(window.contentItem());
     focusState[tree].set(false, false);
     focusState[c1].set(false, false);
     focusState[c2].set(true, false);
@@ -573,7 +573,7 @@ void tst_qquickitem::changeParent()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *child = new TestItem(window.rootItem());
+    QQuickItem *child = new TestItem(window.contentItem());
 
     FocusState focusState;
     focusState << child;
@@ -595,8 +595,8 @@ void tst_qquickitem::changeParent()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *child = new TestItem(window.rootItem());
-    QQuickItem *child2 = new TestItem(window.rootItem());
+    QQuickItem *child = new TestItem(window.contentItem());
+    QQuickItem *child2 = new TestItem(window.contentItem());
 
     FocusState focusState;
     focusState << child << child2;
@@ -616,8 +616,8 @@ void tst_qquickitem::changeParent()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *child = new TestItem(window.rootItem());
-    QQuickItem *child2 = new TestFocusScope(window.rootItem());
+    QQuickItem *child = new TestItem(window.contentItem());
+    QQuickItem *child2 = new TestFocusScope(window.contentItem());
     QQuickItem *item = new TestItem(child);
 
     FocusState focusState;
@@ -638,8 +638,8 @@ void tst_qquickitem::changeParent()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *child = new TestItem(window.rootItem());
-    QQuickItem *child2 = new TestFocusScope(window.rootItem());
+    QQuickItem *child = new TestItem(window.contentItem());
+    QQuickItem *child2 = new TestFocusScope(window.contentItem());
     QQuickItem *item = new TestItem(child2);
 
     FocusState focusState;
@@ -660,8 +660,8 @@ void tst_qquickitem::changeParent()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *child = new TestItem(window.rootItem());
-    QQuickItem *child2 = new TestFocusScope(window.rootItem());
+    QQuickItem *child = new TestItem(window.contentItem());
+    QQuickItem *child2 = new TestFocusScope(window.contentItem());
     QQuickItem *item = new TestItem(child2);
 
     FocusState focusState;
@@ -686,7 +686,7 @@ void tst_qquickitem::changeParent()
     QQuickWindow window;
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
-    QQuickItem *item = new TestFocusScope(window.rootItem());
+    QQuickItem *item = new TestFocusScope(window.contentItem());
     QQuickItem *child = new TestItem(item);
     QQuickItem *child2 = new TestItem;
 
@@ -709,7 +709,7 @@ void tst_qquickitem::changeParent()
 
     focusState.remove(child);
     delete child;
-    item->setParentItem(window.rootItem());
+    item->setParentItem(window.contentItem());
     focusState[item].set(true, true);
     focusState.active(item);
     FVERIFY();
@@ -777,7 +777,7 @@ void tst_qquickitem::parentItemWithFocus()
     focusState[&child].set(false, false);
     FVERIFY();
 
-    parent.setParentItem(window.rootItem());
+    parent.setParentItem(window.contentItem());
     focusState[&parent].set(true, true);
     focusState[&child].set(false, false);
     focusState.active(&parent);
@@ -810,7 +810,7 @@ void tst_qquickitem::parentItemWithFocus()
     focusState[&grandchild].set(false, false);
     FVERIFY();
 
-    parent.setParentItem(window.rootItem());
+    parent.setParentItem(window.contentItem());
     focusState[&parent].set(true, true);
     focusState[&child].set(false, false);
     focusState[&grandchild].set(false, false);
@@ -858,7 +858,7 @@ void tst_qquickitem::reparentFocusedItem()
     ensureFocus(&window);
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
 
-    QQuickItem parent(window.rootItem());
+    QQuickItem parent(window.contentItem());
     QQuickItem child(&parent);
     QQuickItem sibling(&parent);
     QQuickItem grandchild(&child);
@@ -1035,12 +1035,12 @@ void tst_qquickitem::enabledFocus()
     QCOMPARE(root.hasFocus(), true);
     QCOMPARE(root.hasActiveFocus(), false);
 
-    root.setParentItem(window.rootItem());
+    root.setParentItem(window.contentItem());
 
     QCOMPARE(root.isEnabled(), false);
     QCOMPARE(root.hasFocus(), true);
     QCOMPARE(root.hasActiveFocus(), false);
-    QCOMPARE(window.activeFocusItem(), window.rootItem());
+    QCOMPARE(window.activeFocusItem(), window.contentItem());
 
     root.setEnabled(true);
     QCOMPARE(root.isEnabled(), true);
@@ -1108,7 +1108,7 @@ void tst_qquickitem::enabledFocus()
     QCOMPARE(child1.isEnabled(), true);
     QCOMPARE(child1.hasFocus(), true);
     QCOMPARE(child1.hasActiveFocus(), false);
-    QCOMPARE(window.activeFocusItem(), window.rootItem());
+    QCOMPARE(window.activeFocusItem(), window.contentItem());
 
     child2.forceActiveFocus();
     QCOMPARE(root.isEnabled(), true);
@@ -1132,7 +1132,7 @@ void tst_qquickitem::enabledFocus()
     QCOMPARE(child2.isEnabled(), false);
     QCOMPARE(child2.hasFocus(), true);
     QCOMPARE(child2.hasActiveFocus(), false);
-    QCOMPARE(window.activeFocusItem(), window.rootItem());
+    QCOMPARE(window.activeFocusItem(), window.contentItem());
 
     child1.forceActiveFocus();
     QCOMPARE(root.isEnabled(), false);
@@ -1144,7 +1144,7 @@ void tst_qquickitem::enabledFocus()
     QCOMPARE(child2.isEnabled(), false);
     QCOMPARE(child2.hasFocus(), false);
     QCOMPARE(child2.hasActiveFocus(), false);
-    QCOMPARE(window.activeFocusItem(), window.rootItem());
+    QCOMPARE(window.activeFocusItem(), window.contentItem());
 
     root.setEnabled(true);
     QCOMPARE(root.isEnabled(), true);
@@ -1168,13 +1168,13 @@ void tst_qquickitem::mouseGrab()
     TestItem *child1 = new TestItem;
     child1->setAcceptedMouseButtons(Qt::LeftButton);
     child1->setSize(QSizeF(200, 100));
-    child1->setParentItem(window->rootItem());
+    child1->setParentItem(window->contentItem());
 
     TestItem *child2 = new TestItem;
     child2->setAcceptedMouseButtons(Qt::LeftButton);
     child2->setY(51);
     child2->setSize(QSizeF(200, 100));
-    child2->setParentItem(window->rootItem());
+    child2->setParentItem(window->contentItem());
 
     QTest::mousePress(window, Qt::LeftButton, 0, QPoint(50,50));
     QTest::qWait(100);
@@ -1253,7 +1253,7 @@ void tst_qquickitem::touchEventAcceptIgnore()
 
     TestItem *item = new TestItem;
     item->setSize(QSizeF(100, 100));
-    item->setParentItem(window->rootItem());
+    item->setParentItem(window->contentItem());
     item->acceptIncomingTouchEvents = itemSupportsTouch;
 
     static QTouchDevice* device = 0;
@@ -1335,7 +1335,7 @@ void tst_qquickitem::polishOutsideAnimation()
     window->resize(200, 200);
     window->show();
 
-    TestPolishItem *item = new TestPolishItem(window->rootItem());
+    TestPolishItem *item = new TestPolishItem(window->contentItem());
     item->setSize(QSizeF(200, 100));
     QTest::qWait(50);
 
@@ -1384,7 +1384,7 @@ void tst_qquickitem::wheelEvent()
 
     TestItem *item = new TestItem;
     item->setSize(QSizeF(200, 100));
-    item->setParentItem(window->rootItem());
+    item->setParentItem(window->contentItem());
 
     item->setEnabled(enabled);
     item->setVisible(visible);
@@ -1470,7 +1470,7 @@ void tst_qquickitem::hoverEvent()
 
     HoverItem *item = new HoverItem;
     item->setSize(QSizeF(100, 100));
-    item->setParentItem(window->rootItem());
+    item->setParentItem(window->contentItem());
 
     item->setEnabled(enabled);
     item->setVisible(visible);
@@ -1509,7 +1509,7 @@ void tst_qquickitem::hoverEventInParent()
     window->resize(200, 200);
     window->show();
 
-    HoverItem *parentItem = new HoverItem(window->rootItem());
+    HoverItem *parentItem = new HoverItem(window->contentItem());
     parentItem->setSize(QSizeF(200, 200));
     parentItem->setAcceptHoverEvents(true);
 
@@ -1670,7 +1670,7 @@ void tst_qquickitem::acceptedMouseButtons()
 
     QQuickWindow window;
     item.setSize(QSizeF(200,100));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QTest::mousePress(&window, Qt::LeftButton, 0, QPoint(50, 50));
     QTest::mouseRelease(&window, Qt::LeftButton, 0, QPoint(50, 50));
diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
index 61762cb688..fdf834ce08 100644
--- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
+++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
@@ -259,7 +259,7 @@ void tst_QQuickItemLayer::layerVisibility()
     QQuickView view;
     view.setSource(testFileUrl("Visible.qml"));
 
-    QQuickItem *child = view.rootItem()->childItems().at(0);
+    QQuickItem *child = view.contentItem()->childItems().at(0);
     child->setProperty("layerVisible", visible);
     child->setProperty("layerEffect", effect);
     child->setProperty("layerOpacity", opacity);
@@ -305,7 +305,7 @@ void tst_QQuickItemLayer::layerZOrder()
     QQuickView view;
     view.setSource(testFileUrl("ZOrder.qml"));
 
-    QQuickItem *child = view.rootItem()->childItems().at(0);
+    QQuickItem *child = view.contentItem()->childItems().at(0);
     child->setProperty("layerEffect", effect);
 
     view.show();
@@ -340,7 +340,7 @@ void tst_QQuickItemLayer::changeZOrder()
     QQuickView view;
     view.setSource(testFileUrl("ZOrderChange.qml"));
 
-    QQuickItem *child = view.rootItem()->childItems().at(0);
+    QQuickItem *child = view.contentItem()->childItems().at(0);
     child->setProperty("layerEnabled", layered);
     child->setProperty("layerEffect", effect);
     child->setProperty("layerZ", 1);
diff --git a/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp b/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
index c3bf77da29..03e4b4084c 100644
--- a/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
+++ b/tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
@@ -110,7 +110,7 @@ void tst_QQuickPaintedItem::initTestCase()
 void tst_QQuickPaintedItem::update()
 {
     TestPaintedItem item;
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QCOMPARE(hasDirtyContentFlag(&item), false);
     item.update();
@@ -149,7 +149,7 @@ void tst_QQuickPaintedItem::opaquePainting()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QCOMPARE(item.opaquePainting(), false);
 
@@ -187,7 +187,7 @@ void tst_QQuickPaintedItem::antialiasing()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QCOMPARE(item.antialiasing(), false);
 
@@ -225,7 +225,7 @@ void tst_QQuickPaintedItem::mipmap()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QCOMPARE(item.mipmap(), false);
 
@@ -263,7 +263,7 @@ void tst_QQuickPaintedItem::performanceHints()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QCOMPARE(item.performanceHints(), QQuickPaintedItem::PerformanceHints());
 
@@ -332,7 +332,7 @@ void tst_QQuickPaintedItem::contentScale()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QSignalSpy spy(&item, SIGNAL(contentsScaleChanged()));
 
@@ -376,7 +376,7 @@ void tst_QQuickPaintedItem::contentsBoundingRect()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QCOMPARE(item.contentsBoundingRect(), QRectF(0, 0, 320, 240));
 
@@ -414,7 +414,7 @@ void tst_QQuickPaintedItem::fillColor()
 {
     TestPaintedItem item;
     item.setSize(QSizeF(320, 240));
-    item.setParentItem(window.rootItem());
+    item.setParentItem(window.contentItem());
 
     QSignalSpy spy(&item, SIGNAL(fillColorChanged()));
 
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
index cb161c0eeb..b9a18eec01 100644
--- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
+++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
@@ -1481,13 +1481,13 @@ void tst_qquickpositioners::test_repeater()
 {
     QQuickView *window = createView(testFile("repeatertest.qml"));
 
-    QQuickRectangle *one = findItem<QQuickRectangle>(window->rootItem(), "one");
+    QQuickRectangle *one = findItem<QQuickRectangle>(window->contentItem(), "one");
     QVERIFY(one != 0);
 
-    QQuickRectangle *two = findItem<QQuickRectangle>(window->rootItem(), "two");
+    QQuickRectangle *two = findItem<QQuickRectangle>(window->contentItem(), "two");
     QVERIFY(two != 0);
 
-    QQuickRectangle *three = findItem<QQuickRectangle>(window->rootItem(), "three");
+    QQuickRectangle *three = findItem<QQuickRectangle>(window->contentItem(), "three");
     QVERIFY(three != 0);
 
     QCOMPARE(one->x(), 0.0);
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 0f69009815..a5a5efb2d0 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -1191,7 +1191,7 @@ void tst_qquicktextedit::focusOnPress()
 
     QQuickWindow window;
     window.resize(100, 50);
-    textEditObject->setParentItem(window.rootItem());
+    textEditObject->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -2903,7 +2903,7 @@ void tst_qquicktextedit::openInputPanel()
 
     anotherEdit.setFocus(false);
     QVERIFY(qApp->focusObject() != &anotherEdit);
-    QCOMPARE(view.activeFocusItem(), view.rootItem());
+    QCOMPARE(view.activeFocusItem(), view.contentItem());
     anotherEdit.setFocus(true);
 
     qApp->inputMethod()->hide();
@@ -4253,7 +4253,7 @@ void tst_qquicktextedit::keySequence()
     QVERIFY(textEdit != 0);
 
     QQuickWindow window;
-    textEdit->setParentItem(window.rootItem());
+    textEdit->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -4416,7 +4416,7 @@ void tst_qquicktextedit::undo()
     QVERIFY(textEdit != 0);
 
     QQuickWindow window;
-    textEdit->setParentItem(window.rootItem());
+    textEdit->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -4502,7 +4502,7 @@ void tst_qquicktextedit::redo()
     QVERIFY(textEdit != 0);
 
     QQuickWindow window;
-    textEdit->setParentItem(window.rootItem());
+    textEdit->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -4726,7 +4726,7 @@ void tst_qquicktextedit::undo_keypressevents()
     QVERIFY(textEdit != 0);
 
     QQuickWindow window;
-    textEdit->setParentItem(window.rootItem());
+    textEdit->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 1d65cef99b..3c9e8821d3 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -2502,7 +2502,7 @@ void tst_qquicktextinput::copyAndPasteKeySequence()
     QVERIFY(textInput != 0);
 
     QQuickWindow window;
-    textInput->setParentItem(window.rootItem());
+    textInput->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -3297,7 +3297,7 @@ void tst_qquicktextinput::focusOnPress()
 
     QQuickWindow window;
     window.resize(100, 50);
-    textInputObject->setParentItem(window.rootItem());
+    textInputObject->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -3405,7 +3405,7 @@ void tst_qquicktextinput::openInputPanel()
 
     anotherInput.setFocus(false);
     QVERIFY(qApp->focusObject() != &anotherInput);
-    QCOMPARE(view.activeFocusItem(), view.rootItem());
+    QCOMPARE(view.activeFocusItem(), view.contentItem());
     anotherInput.setFocus(true);
 
     qApp->inputMethod()->hide();
@@ -3449,7 +3449,7 @@ void tst_qquicktextinput::setHAlignClearCache()
     QQuickView view;
     MyTextInput input;
     input.setText("Hello world");
-    input.setParentItem(view.rootItem());
+    input.setParentItem(view.contentItem());
     view.show();
     view.requestActivateWindow();
     QTest::qWaitForWindowActive(&view);
@@ -3469,8 +3469,8 @@ void tst_qquicktextinput::focusOutClearSelection()
     QQuickTextInput input2;
     input.setText(QLatin1String("Hello world"));
     input.setFocus(true);
-    input2.setParentItem(view.rootItem());
-    input.setParentItem(view.rootItem());
+    input2.setParentItem(view.contentItem());
+    input.setParentItem(view.contentItem());
     input.componentComplete();
     input2.componentComplete();
     view.show();
@@ -4967,7 +4967,7 @@ void tst_qquicktextinput::keySequence()
     textInput->setEchoMode(echoMode);
 
     QQuickWindow window;
-    textInput->setParentItem(window.rootItem());
+    textInput->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -5128,7 +5128,7 @@ void tst_qquicktextinput::undo()
     QVERIFY(textInput != 0);
 
     QQuickWindow window;
-    textInput->setParentItem(window.rootItem());
+    textInput->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -5214,7 +5214,7 @@ void tst_qquicktextinput::redo()
     QVERIFY(textInput != 0);
 
     QQuickWindow window;
-    textInput->setParentItem(window.rootItem());
+    textInput->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -5546,7 +5546,7 @@ void tst_qquicktextinput::undo_keypressevents()
     QVERIFY(textInput != 0);
 
     QQuickWindow window;
-    textInput->setParentItem(window.rootItem());
+    textInput->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
@@ -5953,7 +5953,7 @@ void tst_qquicktextinput::setInputMask()
         textInput->insert(0, input);
     } else {
         QQuickWindow window;
-        textInput->setParentItem(window.rootItem());
+        textInput->setParentItem(window.contentItem());
         window.show();
         window.requestActivateWindow();
         QTest::qWaitForWindowActive(&window);
@@ -6083,7 +6083,7 @@ void tst_qquicktextinput::keypress_inputMask()
     QVERIFY(textInput != 0);
 
     QQuickWindow window;
-    textInput->setParentItem(window.rootItem());
+    textInput->setParentItem(window.contentItem());
     window.show();
     window.requestActivateWindow();
     QTest::qWaitForWindowActive(&window);
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 2b60ac3733..78ff64da07 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -956,7 +956,7 @@ void tst_qquickvisualdatamodel::itemsDestroyed()
         view.show();
         QVERIFY(QTest::qWaitForWindowExposed(&view));
 
-        QVERIFY(delegate = findItem<QQuickItem>(view.rootItem(), "delegate", 1));
+        QVERIFY(delegate = findItem<QQuickItem>(view.contentItem(), "delegate", 1));
     }
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     QVERIFY(!delegate);
@@ -3073,7 +3073,7 @@ void tst_qquickvisualdatamodel::insert()
     QScopedPointer<QObject> object(component.create());
     QQuickListView *listView = qobject_cast<QQuickListView *>(object.data());
     QVERIFY(listView);
-    listView->setParentItem(window.rootItem());
+    listView->setParentItem(window.contentItem());
 
     QQuickItem *contentItem = listView->contentItem();
     QVERIFY(contentItem);
@@ -3537,7 +3537,7 @@ void tst_qquickvisualdatamodel::resolve()
     QScopedPointer<QObject> object(component.create());
     QQuickListView *listView = qobject_cast<QQuickListView *>(object.data());
     QVERIFY(listView);
-    listView->setParentItem(window.rootItem());
+    listView->setParentItem(window.contentItem());
 
     QQuickItem *contentItem = listView->contentItem();
     QVERIFY(contentItem);
@@ -3937,7 +3937,7 @@ void tst_qquickvisualdatamodel::warnings()
     QScopedPointer<QObject> object(component.create());
     QQuickListView *listView = qobject_cast<QQuickListView *>(object.data());
     QVERIFY(listView);
-    listView->setParentItem(window.rootItem());
+    listView->setParentItem(window.contentItem());
 
     QQuickItem *contentItem = listView->contentItem();
     QVERIFY(contentItem);
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 04bb5800f3..c108ac4562 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -120,11 +120,11 @@ public:
         , m_rootItem(0)
     {
     }
-    Q_INVOKABLE QQuickItem *rootItem()
+    Q_INVOKABLE QQuickItem *contentItem()
     {
         if (!m_rootItem) {
             QQuickWindowPrivate *c = QQuickWindowPrivate::get(window());
-            m_rootItem = c->rootItem;
+            m_rootItem = c->contentItem;
             QObject::connect(m_rootItem, SIGNAL(destroyed()), this, SLOT(rootItemDestroyed()));
         }
         return m_rootItem;
@@ -326,7 +326,7 @@ void tst_qquickwindow::constantUpdates()
 {
     QQuickWindow window;
     window.resize(250, 250);
-    ConstantUpdateItem item(window.rootItem());
+    ConstantUpdateItem item(window.contentItem());
     window.show();
     QTRY_VERIFY(item.iterations > 60);
 }
@@ -343,7 +343,7 @@ void tst_qquickwindow::touchEvent_basic()
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
 
-    TestTouchItem *bottomItem = new TestTouchItem(window->rootItem());
+    TestTouchItem *bottomItem = new TestTouchItem(window->contentItem());
     bottomItem->setObjectName("Bottom Item");
     bottomItem->setSize(QSizeF(150, 150));
 
@@ -472,7 +472,7 @@ void tst_qquickwindow::touchEvent_propagation()
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
 
-    TestTouchItem *bottomItem = new TestTouchItem(window->rootItem());
+    TestTouchItem *bottomItem = new TestTouchItem(window->contentItem());
     bottomItem->setObjectName("Bottom Item");
     bottomItem->setSize(QSizeF(150, 150));
 
@@ -605,7 +605,7 @@ void tst_qquickwindow::touchEvent_cancel()
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
 
-    TestTouchItem *item = new TestTouchItem(window->rootItem());
+    TestTouchItem *item = new TestTouchItem(window->contentItem());
     item->setPos(QPointF(50, 50));
     item->setSize(QSizeF(150, 150));
 
@@ -638,7 +638,7 @@ void tst_qquickwindow::touchEvent_reentrant()
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
 
-    TestTouchItem *item = new TestTouchItem(window->rootItem());
+    TestTouchItem *item = new TestTouchItem(window->contentItem());
 
     item->spinLoopWhenPressed = true; // will call processEvents() from the touch handler
 
@@ -676,7 +676,7 @@ void tst_qquickwindow::touchEvent_velocity()
     QVERIFY(QTest::qWaitForWindowExposed(window));
     QTest::qWait(10);
 
-    TestTouchItem *item = new TestTouchItem(window->rootItem());
+    TestTouchItem *item = new TestTouchItem(window->contentItem());
     item->setPos(QPointF(50, 50));
     item->setSize(QSizeF(150, 150));
 
@@ -732,7 +732,7 @@ void tst_qquickwindow::mouseFromTouch_basic()
     QVERIFY(QTest::qWaitForWindowExposed(window));
     QTest::qWait(10);
 
-    TestTouchItem *item = new TestTouchItem(window->rootItem());
+    TestTouchItem *item = new TestTouchItem(window->contentItem());
     item->setPos(QPointF(50, 50));
     item->setSize(QSizeF(150, 150));
     item->acceptTouchEvents = false;
@@ -788,7 +788,7 @@ void tst_qquickwindow::clearWindow()
 {
     QQuickWindow *window = new QQuickWindow;
     QQuickItem *item = new QQuickItem;
-    item->setParentItem(window->rootItem());
+    item->setParentItem(window->contentItem());
 
     QVERIFY(item->window() == window);
 
@@ -810,7 +810,7 @@ void tst_qquickwindow::mouseFiltering()
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
 
-    TestTouchItem *bottomItem = new TestTouchItem(window->rootItem());
+    TestTouchItem *bottomItem = new TestTouchItem(window->contentItem());
     bottomItem->setObjectName("Bottom Item");
     bottomItem->setSize(QSizeF(150, 150));
 
@@ -1018,7 +1018,7 @@ void tst_qquickwindow::ignoreUnhandledMouseEvents()
 
     QQuickItem* item = new QQuickItem;
     item->setSize(QSizeF(100, 100));
-    item->setParentItem(window->rootItem());
+    item->setParentItem(window->contentItem());
 
     {
         QMouseEvent me(QEvent::MouseButtonPress, QPointF(50, 50), Qt::LeftButton, Qt::LeftButton,
@@ -1079,7 +1079,7 @@ void tst_qquickwindow::cursor()
     QQuickItem parentItem;
     parentItem.setPos(QPointF(0, 0));
     parentItem.setSize(QSizeF(180, 180));
-    parentItem.setParentItem(window.rootItem());
+    parentItem.setParentItem(window.contentItem());
 
     QQuickItem childItem;
     childItem.setPos(QPointF(60, 90));
@@ -1090,7 +1090,7 @@ void tst_qquickwindow::cursor()
     clippingItem.setPos(QPointF(120, 120));
     clippingItem.setSize(QSizeF(180, 180));
     clippingItem.setClip(true);
-    clippingItem.setParentItem(window.rootItem());
+    clippingItem.setParentItem(window.contentItem());
 
     QQuickItem clippedItem;
     clippedItem.setPos(QPointF(-30, -30));