Fix handling of destroy-show and re-enable the zoom test for qmlpreview

Fixes: QTBUG-84059
Change-Id: Id70c043f96e9525a5a6053efbf99c5ea3408da65
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 9b88946090..b2ff74b631 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -390,6 +390,7 @@ private slots:
     void constantUpdatesOnWindow();
     void mouseFiltering();
     void headless();
+    void destroyShowWithoutHide();
     void noUpdateWhenNothingChanges();
 
     void touchEvent_basic();
@@ -1624,6 +1625,41 @@ void tst_qquickwindow::headless()
              qPrintable(errorMessage));
 }
 
+void tst_qquickwindow::destroyShowWithoutHide()
+{
+    // this is a variation of the headless case, to test if the more aggressive
+    // destroy(); show(); sequence survives.
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("Headless.qml"));
+    QObject *created = component.create();
+    QScopedPointer<QObject> cleanup(created);
+
+    QQuickWindow *window = qobject_cast<QQuickWindow*>(created);
+    QVERIFY(window);
+    window->setTitle(QTest::currentTestFunction());
+    window->show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+    QVERIFY(window->isSceneGraphInitialized());
+
+    QImage originalContent = window->grabWindow();
+
+    window->destroy();
+    QVERIFY(!window->handle());
+
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QVERIFY(window->isSceneGraphInitialized());
+
+    QImage newContent = window->grabWindow();
+    QString errorMessage;
+    QVERIFY2(QQuickVisualTestUtil::compareImages(newContent, originalContent, &errorMessage),
+             qPrintable(errorMessage));
+}
+
 void tst_qquickwindow::noUpdateWhenNothingChanges()
 {
     QQuickWindow window;