Merge 5.9 into 5.9.0v5.9.0-beta4

Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
index 1598382959..a52b80170f 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -360,11 +360,16 @@ void tst_QSocketNotifier::asyncMultipleDatagram()
     QSignalSpy spy(m_asyncReceiver, &QIODevice::readyRead);
     connect(m_asyncReceiver, &QIODevice::readyRead, this,
             &tst_QSocketNotifier::async_readDatagramSlot);
+
+    // activate socket notifiers
+    QTestEventLoop::instance().enterLoopMSecs(100);
+
     m_asyncSender->writeDatagram("1", makeNonAny(m_asyncReceiver->localAddress()), port);
     m_asyncSender->writeDatagram("2", makeNonAny(m_asyncReceiver->localAddress()), port);
     // wait a little to ensure that the datagrams we've just sent
     // will be delivered on receiver side.
     QTest::qSleep(100);
+    QVERIFY(m_asyncReceiver->hasPendingDatagrams());
 
     QTimer::singleShot(500, this, &tst_QSocketNotifier::async_writeDatagramSlot);