1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QErrorMessage test when using native dialogs

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2023-01-09 13:40:16 +01:00 committed by Qt Cherry-pick Bot
parent c6f986d717
commit 8c42d4373e
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoamessagedialog.mm
View File

@ -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];
}
}

1
tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
View File

@ -12,6 +12,7 @@ qt_internal_add_test(tst_qerrormessage
tst_qerrormessage.cpp
LIBRARIES
Qt::Gui
Qt::GuiPrivate
Qt::Widgets
)

22
tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
View File

@ -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");