1 files changed, 36 insertions, 0 deletions
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
index 09359060f6..5e8f762e23 100644
--- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
+++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
@@ -34,6 +34,7 @@
 #include <QtQuick/qquickitem.h>
 #include "../../shared/util.h"
 #include <QtGui/QWindow>
+#include <QtGui/QImage>
 #include <QtCore/QDebug>
 #include <QtQml/qqmlengine.h>
 
@@ -55,6 +56,8 @@ private slots:
     void readback();
     void renderingSignals();
     void grabBeforeShow();
+    void reparentToNewWindow();
+    void nullEngine();
 };
 
 
@@ -301,6 +304,39 @@ void tst_qquickwidget::grabBeforeShow()
     QVERIFY(!widget.grab().isNull());
 }
 
+void tst_qquickwidget::reparentToNewWindow()
+{
+    QWidget window1;
+    QWidget window2;
+
+    QQuickWidget *qqw = new QQuickWidget(&window1);
+    qqw->setSource(testFileUrl("rectangle.qml"));
+    window1.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window1, 5000));
+    window2.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window2, 5000));
+
+    QSignalSpy afterRenderingSpy(qqw->quickWindow(), &QQuickWindow::afterRendering);
+    qqw->setParent(&window2);
+    qqw->show();
+    QTRY_VERIFY(afterRenderingSpy.size() > 0);
+
+    QImage img = qqw->grabFramebuffer();
+    QCOMPARE(img.pixel(5, 5), qRgb(255, 0, 0));
+}
+
+void tst_qquickwidget::nullEngine()
+{
+    QQuickWidget widget;
+    // Default should have no errors, even with a null qml engine
+    QVERIFY(widget.errors().isEmpty());
+    QCOMPARE(widget.status(), QQuickWidget::Null);
+
+    // A QML engine should be created lazily.
+    QVERIFY(widget.rootContext());
+    QVERIFY(widget.engine());
+}
+
 QTEST_MAIN(tst_qquickwidget)
 
 #include "tst_qquickwidget.moc"