diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 13:41:07 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 13:41:07 (GMT) |
| commit | aa0dfd5befb7c00ceb23a67d7f1d49e165756d28 (patch) | |
| tree | 520b6c2a2f3724bce25fb5f88bad19e244ffb5a4 /src/corelib/kernel | |
| parent | 654cbdb901386b2a8e168cd52446abdddec1aa28 (diff) | |
| parent | 5491ab9c921c8e7b89e335c7d09219153ae1d21a (diff) | |
| download | Qt-aa0dfd5befb7c00ceb23a67d7f1d49e165756d28.zip Qt-aa0dfd5befb7c00ceb23a67d7f1d49e165756d28.tar.gz Qt-aa0dfd5befb7c00ceb23a67d7f1d49e165756d28.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index ccf5b96..29b7568 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -470,7 +470,7 @@ LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) } return 0; } else if (message == WM_TIMER) { - if (wp == ~0u) { + if (wp == ~1u) { KillTimer(d->internalHwnd, wp); int localSerialNumber = d->serialNumber; (void) d->wakeUps.fetchAndStoreRelease(0); @@ -488,7 +488,7 @@ LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) if (GetQueueStatus(QS_INPUT | QS_RAWINPUT | QS_TIMER) != 0) { // delay the next pass of sendPostedEvents() until we get the special // WM_TIMER, which allows all pending Windows messages to be processed - SetTimer(d->internalHwnd, ~0u, 0, 0); + SetTimer(d->internalHwnd, ~1u, 0, 0); } else { // nothing pending in the queue, let sendPostedEvents go through d->wakeUps.fetchAndStoreRelease(0); |