1 files changed, 51 insertions, 11 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index d7faf8a76b..6ebf255f31 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -13,7 +13,7 @@
 #include <qsharedpointer.h>
 #include <qfiledialog.h>
 #include <qabstractitemdelegate.h>
-#include <qitemdelegate.h>
+#include <qstyleditemdelegate.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
@@ -128,9 +128,10 @@ private slots:
     void QTBUG49600_nativeIconProviderCrash();
     void focusObjectDuringDestruction();
 
-    // NOTE: Please keep widgetlessNativeDialog() as the LAST test!
+    // NOTE: Please keep widgetlessNativeDialog() and
+    // hideNativeByDestruction() as the LAST tests!
     //
-    // widgetlessNativeDialog() is the only test function that creates
+    // widgetlessNativeDialog() are the only test functions that create
     // a native file dialog instance. GTK+ versions prior 3.15.5 have
     // a nasty bug (https://bugzilla.gnome.org/show_bug.cgi?id=725164)
     // in GtkFileChooserWidget, which makes it leak its folder change
@@ -141,6 +142,7 @@ private slots:
     // The crash has been fixed in GTK+ 3.15.5, but the RHEL 7.2 CI has
     // GTK+ 3.14.13 installed (QTBUG-55276).
     void widgetlessNativeDialog();
+    void hideNativeByDestruction();
 
 private:
     void cleanupSettingsFile();
@@ -517,7 +519,6 @@ void tst_QFiledialog::completer()
     for (int i = 0; i < input.size(); ++i)
         QTest::keyPress(lineEdit, input[i].toLatin1());
 
-    QStringList expectedFiles;
     if (expected == -1) {
         QString fullPath = startPath;
         if (!fullPath.endsWith(QLatin1Char('/')))
@@ -530,11 +531,11 @@ void tst_QFiledialog::completer()
 
         QFileInfo fi(fullPath);
         QDir x(fi.absolutePath());
-        expectedFiles = x.entryList(model->filter());
+        const QStringList expectedFiles = x.entryList(model->filter());
         expected = 0;
         if (input.startsWith(".."))
             input.clear();
-        foreach (const QString &expectedFile, expectedFiles) {
+        for (const QString &expectedFile : expectedFiles) {
             if (expectedFile.startsWith(input, caseSensitivity))
                 ++expected;
         }
@@ -805,7 +806,7 @@ void tst_QFiledialog::itemDelegate()
 {
     QFileDialog fd;
     QVERIFY(fd.itemDelegate() != 0);
-    QItemDelegate *id = new QItemDelegate(&fd);
+    QStyledItemDelegate *id = new QStyledItemDelegate(&fd);
     fd.setItemDelegate(id);
     QCOMPARE(fd.itemDelegate(), (QAbstractItemDelegate *)id);
 }
@@ -924,7 +925,7 @@ void tst_QFiledialog::selectFiles()
     QString filesPath = fd.directory().absolutePath();
     for (int i=0; i < 5; ++i) {
         QFile file(filesPath + QLatin1String("/qfiledialog_auto_test_not_pres_") + QString::number(i));
-        file.open(QIODevice::WriteOnly);
+        QVERIFY(file.open(QIODevice::WriteOnly));
         file.resize(1024);
         file.flush();
         file.close();
@@ -1116,7 +1117,6 @@ void tst_QFiledialog::focus()
     QFileDialog fd;
     fd.setDirectory(QDir::currentPath());
     fd.show();
-    QApplicationPrivate::setActiveWindow(&fd);
     QVERIFY(QTest::qWaitForWindowActive(&fd));
     QCOMPARE(fd.isVisible(), true);
     QCOMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&fd));
@@ -1438,7 +1438,7 @@ void tst_QFiledialog::widgetlessNativeDialog()
         QSKIP("This platform always uses widgets to realize its QFileDialog, instead of the native file dialog.");
 #ifdef Q_OS_ANDROID
     // QTBUG-101194
-    QSKIP("Android: This keeeps the window open. Figure out why.");
+    QSKIP("Android: This keeps the window open. Figure out why.");
 #endif
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, false);
     QFileDialog fd;
@@ -1452,6 +1452,46 @@ void tst_QFiledialog::widgetlessNativeDialog()
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, true);
 }
 
+void tst_QFiledialog::hideNativeByDestruction()
+{
+    if (!QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog))
+        QSKIP("This platform always uses widgets to realize its QFileDialog, instead of the native file dialog.");
+
+#ifdef Q_OS_ANDROID
+    // QTBUG-101194
+    QSKIP("Android: This keeps the native window open. Figure out why.");
+#endif
+
+    QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, false);
+    auto resetAttribute = qScopeGuard([]{
+        QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, true);
+    });
+
+    QWidget window;
+    QWidget *child = new QWidget(&window);
+    QPointer<QFileDialog> dialog = new QFileDialog(child);
+    // Make it application modal so that we don't end up with a sheet on macOS
+    dialog->setWindowModality(Qt::ApplicationModal);
+    window.show();
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+    dialog->open();
+
+    // We test that the dialog opens and closes by watching the activation of the
+    // transient parent window. If it doesn't deactivate, then we have to skip.
+    const auto windowActive = [&window]{ return window.isActiveWindow(); };
+    const auto windowInactive = [&window]{ return !window.isActiveWindow(); };
+    if (!QTest::qWaitFor(windowInactive, 2000))
+        QSKIP("Dialog didn't activate");
+
+    // This should destroy the dialog and close the native window
+    child->deleteLater();
+    QTRY_VERIFY(!dialog);
+    // If the native window is still open, then the transient parent can't become
+    // active
+    window.activateWindow();
+    QVERIFY(QTest::qWaitFor(windowActive, 2000));
+}
+
 void tst_QFiledialog::selectedFilesWithoutWidgets()
 {
     // Test for a crash when widgets are not instantiated yet.