Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/corelib/kernel/qeventdispatcher_win.cpp

Change-Id: I32db3f755577aefc15f757041367d6144f5e5c66

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index fa448a9593..9ab7e4e315 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1229,6 +1229,11 @@ void DeleteLaterWidget::runTest()
 
     QCoreApplication::processEvents();
 
+    // At this point, the event queue is empty. As we want a deferred
+    // deletion to occur before the timer event, we should provoke the
+    // event dispatcher for the next spin.
+    QCoreApplication::eventDispatcher()->interrupt();
+
     QVERIFY(!stillAlive); // verify at the end to make test terminate
 }
 
@@ -1258,8 +1263,10 @@ void tst_QApplication::testDeleteLater()
     QObject *stillAlive = wgt->findChild<QObject*>("deleteLater");
     QVERIFY(stillAlive);
 
+    wgt->show();
     QCoreApplication::exec();
 
+    QVERIFY(wgt->isHidden());
     delete wgt;
 
 }