From 8c42d4373e08aa9f1f8010bbe1492dc8fdaa0790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 9 Jan 2023 13:40:16 +0100
Subject: [PATCH] Fix QErrorMessage test when using native dialogs

When the test is showing the error message over and over, it's not
waiting for the native dialog to actually become visible, and as
a result, hiding it has no effect and won't result in a call
to processResponse, where we got rid of the native dialog.

To fix this we explicitly release the native dialog when
encountering this corner case.

Add logic to QErrorMessage to test both native and non
native dialogs.

Change-Id: I19ac3f463997aed1e66f646fdfcbb4d2459116d1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 349fda471e0df473f38f59c2baae688959d6d273)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../platforms/cocoa/qcocoamessagedialog.mm    |  2 ++
 .../dialogs/qerrormessage/CMakeLists.txt      |  1 +
 .../qerrormessage/tst_qerrormessage.cpp       | 22 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm
index 84aea950c3c..21a423d4072 100644
--- a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm
+++ b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm
@@ -307,6 +307,8 @@ void QCocoaMessageDialog::hide()
         }
     } else {
         qCDebug(lcQpaDialogs) << "No need to hide already hidden" << m_alert;
+        auto alert = std::exchange(m_alert, nil);
+        [alert autorelease];
     }
 }
 
diff --git a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
index ba4ea75b79f..1cb63beea96 100644
--- a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
@@ -12,6 +12,7 @@ qt_internal_add_test(tst_qerrormessage
         tst_qerrormessage.cpp
     LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Widgets
 )
 
diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
index 97dad396e5d..5cae8263dc6 100644
--- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
+++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
@@ -5,16 +5,38 @@
 #include <QDebug>
 #include <QCheckBox>
 
+#include <qpa/qplatformtheme.h>
+#include <private/qguiapplication_p.h>
+
 class tst_QErrorMessage : public QObject
 {
     Q_OBJECT
 
 private slots:
+    void initTestCase_data();
+    void init();
+
     void dontShowAgain();
     void dontShowCategoryAgain();
 
 };
 
+void tst_QErrorMessage::initTestCase_data()
+{
+    QTest::addColumn<bool>("useNativeDialog");
+    QTest::newRow("widget") << false;
+    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
+        if (theme->usePlatformNativeDialog(QPlatformTheme::MessageDialog))
+            QTest::newRow("native") << true;
+    }
+}
+
+void tst_QErrorMessage::init()
+{
+    QFETCH_GLOBAL(bool, useNativeDialog);
+    qApp->setAttribute(Qt::AA_DontUseNativeDialogs, !useNativeDialog);
+}
+
 void tst_QErrorMessage::dontShowAgain()
 {
     QString plainString = QLatin1String("foo");