diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 15:35:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 15:35:14 (GMT) |
| commit | 1b49d24d527278eb4a418ee3cefa9db86ee60557 (patch) | |
| tree | daec401380e8c55466199c2fa6c073d2b31ea79a | |
| parent | f40bda836b53ac8ce695ef9b3a4f94dc02270105 (diff) | |
| parent | 220efa578b7d032257c7fa95aaf1295330fd474e (diff) | |
| download | Qt-1b49d24d527278eb4a418ee3cefa9db86ee60557.zip Qt-1b49d24d527278eb4a418ee3cefa9db86ee60557.tar.gz Qt-1b49d24d527278eb4a418ee3cefa9db86ee60557.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index bba563a..6d90a51 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -530,10 +530,7 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp) PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0); } } else if (d->sendPostedEventsWindowsTimerId == 0 - && localSerialNumber != d->lastSerialNumber - // if this message IS the one that triggers sendPostedEvents(), no need to post it again - && (msg->hwnd != d->internalHwnd - || msg->message != WM_QT_SENDPOSTEDEVENTS)) { + && localSerialNumber != d->lastSerialNumber) { // start a special timer to continue delivering posted events while // there are still input and timer messages in the message queue d->sendPostedEventsWindowsTimerId = SetTimer(d->internalHwnd, |