Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: I05f4e29dd3435bb843f9b2250574a61d688d5992

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 5d1897ab2d..ff8c80e3ae 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -2033,6 +2033,7 @@ void tst_qquickwindow::attachedProperty()
     QCOMPARE(view.rootObject()->property("contentItem").value<QQuickItem*>(), view.contentItem());
     QCOMPARE(view.rootObject()->property("windowWidth").toInt(), view.width());
     QCOMPARE(view.rootObject()->property("windowHeight").toInt(), view.height());
+    QCOMPARE(view.rootObject()->property("window").value<QQuickView*>(), &view);
 
     QQuickWindow *innerWindow = view.rootObject()->findChild<QQuickWindow*>("extraWindow");
     QVERIFY(innerWindow);
@@ -2045,6 +2046,13 @@ void tst_qquickwindow::attachedProperty()
     QCOMPARE(text->property("contentItem").value<QQuickItem*>(), innerWindow->contentItem());
     QCOMPARE(text->property("windowWidth").toInt(), innerWindow->width());
     QCOMPARE(text->property("windowHeight").toInt(), innerWindow->height());
+    QCOMPARE(text->property("window").value<QQuickWindow*>(), innerWindow);
+
+    text->setParentItem(0);
+    QVERIFY(!text->property("contentItem").value<QQuickItem*>());
+    QCOMPARE(text->property("windowWidth").toInt(), 0);
+    QCOMPARE(text->property("windowHeight").toInt(), 0);
+    QVERIFY(!text->property("window").value<QQuickWindow*>());
 }
 
 class RenderJob : public QRunnable