Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index e1c4019fba..ff2d8fd191 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -401,6 +401,8 @@ private slots:
 
     void tabletTracking();
 
+    void closeEvent();
+
 private:
     bool ensureScreenSize(int width, int height);
 
@@ -10808,5 +10810,31 @@ void tst_QWidget::tabletTracking()
     QTRY_COMPARE(widget.moveEventCount, 3);
 }
 
+class CloseCountingWidget : public QWidget
+{
+public:
+    int closeCount = 0;
+    void closeEvent(QCloseEvent *ev) override;
+};
+
+void CloseCountingWidget::closeEvent(QCloseEvent *ev)
+{
+    ++closeCount;
+    ev->accept();
+}
+
+void tst_QWidget::closeEvent()
+{
+    CloseCountingWidget widget;
+    widget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
+    // Yes we call the close() function twice. This mimics the behavior of QTBUG-43344 where
+    // QApplication first closes all windows and then QCocoaApplication flushes window system
+    // events, triggering more close events.
+    widget.windowHandle()->close();
+    widget.windowHandle()->close();
+    QCOMPARE(widget.closeCount, 1);
+}
+
 QTEST_MAIN(tst_QWidget)
 #include "tst_qwidget.moc"