1 files changed, 41 insertions, 0 deletions
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index afdf18fedc..0d52f197a0 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -58,6 +58,9 @@ private slots:
     void acceptedRejectedSignals();
     void acceptedRejectedSignals_data();
 
+    void overrideDone_data();
+    void overrideDone();
+
     void cleanup();
 };
 
@@ -152,6 +155,44 @@ void tst_QMessageBox::init()
     qApp->setAttribute(Qt::AA_DontUseNativeDialogs, !useNativeDialog);
 }
 
+class OverridingMessageBox : public QMessageBox
+{
+public:
+    void done(int result) override {
+        doneResult = result;
+        QMessageBox::done(result);
+    }
+    std::optional<int> doneResult;
+};
+
+void tst_QMessageBox::overrideDone_data()
+{
+    QTest::addColumn<QMessageBox::StandardButton>("button");
+    QTest::addColumn<int>("closeAction");
+    QTest::addColumn<int>("result");
+
+    QTest::newRow("close") << QMessageBox::Help << int(ExecCloseHelper::CloseWindow) << 0;
+    QTest::newRow("yes") << QMessageBox::Yes << int(Qt::Key_Enter) << int(QMessageBox::Yes);
+    QTest::newRow("no") << QMessageBox::No << int(Qt::Key_Enter) << int(QMessageBox::No);
+}
+
+void tst_QMessageBox::overrideDone()
+{
+    QFETCH(QMessageBox::StandardButton, button);
+    QFETCH(int, closeAction);
+    QFETCH(int, result);
+
+    OverridingMessageBox messageBox;
+    messageBox.addButton(button);
+    messageBox.setDefaultButton(button);
+    ExecCloseHelper closeHelper;
+    closeHelper.start(closeAction, &messageBox);
+    messageBox.exec();
+    QVERIFY(messageBox.doneResult.has_value());
+    QCOMPARE(*messageBox.doneResult, result);
+
+}
+
 void tst_QMessageBox::cleanup()
 {
     QTRY_VERIFY(QApplication::topLevelWidgets().isEmpty()); // OS X requires TRY