diff options
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 97e3cbdb04..c1e7ddfdf9 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -249,6 +249,8 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA void QEventDispatcherWin32Private::startPostedEventsTimer() { + // we received WM_QT_SENDPOSTEDEVENTS, so allow posting it again + wakeUps.storeRelaxed(0); if (sendPostedEventsTimerId == 0) { // Start a timer to deliver posted events when the message queue is emptied. sendPostedEventsTimerId = SetTimer(internalHwnd, SendPostedEventsTimerId, diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp index aea1c7ec9b..a3732f2d95 100644 --- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp +++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp @@ -397,9 +397,6 @@ void tst_QEventDispatcher::postEventFromThread() } done = true; - if (QAbstractEventDispatcher::instance()->inherits("QEventDispatcherWin32")) - QEXPECT_FAIL("", QAbstractEventDispatcher::instance()->metaObject()->className(), Continue); - QVERIFY(!hadToQuit); QVERIFY(threadPool->waitForDone()); } |