1 files changed, 33 insertions, 3 deletions
diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
index 97dad396e5..53ade3cbc6 100644
--- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
+++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
@@ -1,20 +1,43 @@
 // 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>
 #include <QErrorMessage>
 #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 baseClassSetVisible();
 
 };
 
+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");
@@ -47,8 +70,7 @@ void tst_QErrorMessage::dontShowAgain()
     QVERIFY(errorMessageDialog.isVisible());
     checkBox = errorMessageDialog.findChild<QCheckBox*>();
     QVERIFY(checkBox);
-    QVERIFY(!checkBox->isChecked());
-    checkBox->setChecked(true);
+    QVERIFY(checkBox->isChecked());
     errorMessageDialog.close();
 
     errorMessageDialog.showMessage(htmlString);
@@ -116,5 +138,13 @@ void tst_QErrorMessage::dontShowCategoryAgain()
     QVERIFY(errorMessageDialog.isVisible());
 }
 
+void tst_QErrorMessage::baseClassSetVisible()
+{
+    QErrorMessage errorMessage;
+    errorMessage.QDialog::setVisible(true);
+    QCOMPARE(errorMessage.isVisible(), true);
+    errorMessage.close();
+}
+
 QTEST_MAIN(tst_QErrorMessage)
 #include "tst_qerrormessage.moc"