diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-01 00:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-01 00:00:11 (GMT) |
| commit | aa108fba41055d04ccbb0b0e304e8685e9f90d8c (patch) | |
| tree | 26bc6e93e1ad3b2b04c4e30545ad0e946be61c08 /src/corelib | |
| parent | e0801405dc18384358eec85663d5bff8b5ea56a0 (diff) | |
| parent | 2c8b7f0a4e8a7621e5efbb49e3af9ef1ee367b30 (diff) | |
| download | Qt-aa108fba41055d04ccbb0b0e304e8685e9f90d8c.zip Qt-aa108fba41055d04ccbb0b0e304e8685e9f90d8c.tar.gz Qt-aa108fba41055d04ccbb0b0e304e8685e9f90d8c.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 91c20b5..a363874 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -492,7 +492,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA // we also use a Windows timer to send posted events when the message queue is full || (message == WM_TIMER && d->sendPostedEventsWindowsTimerId != 0 - && wp == d->sendPostedEventsWindowsTimerId)) { + && wp == (uint)d->sendPostedEventsWindowsTimerId)) { int localSerialNumber = d->serialNumber; if (localSerialNumber != d->lastSerialNumber) { d->lastSerialNumber = localSerialNumber; |