diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-01 11:50:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 14:39:55 +0100 |
| commit | 24f845dd200bfcaf71bd4e4f84b18d9da21fe67d (patch) | |
| tree | cbd54715e1a84e9f3bd10e5e64efac94721e6bbf | |
| parent | 6264bf242a267eff0dde578c64e0442e1924bce3 (diff) | |
qeventdispatcher_win: Fix warnings about QAtomicInt.
Change-Id: I2639fcee046ad3cc5de9c2635fdb6de4b757fc27
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| -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 fc66e9bfd6..c64b09c98d 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -425,7 +425,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA || (message == WM_TIMER && d->sendPostedEventsWindowsTimerId != 0 && wp == (uint)d->sendPostedEventsWindowsTimerId)) { - int localSerialNumber = d->serialNumber; + const int localSerialNumber = d->serialNumber.load(); if (localSerialNumber != d->lastSerialNumber) { d->lastSerialNumber = localSerialNumber; QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); @@ -448,7 +448,7 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp) if (q) { MSG *msg = (MSG *) lp; QEventDispatcherWin32Private *d = q->d_func(); - int localSerialNumber = d->serialNumber; + const int localSerialNumber = d->serialNumber.load(); if (HIWORD(GetQueueStatus(QS_TIMER | QS_INPUT | QS_RAWINPUT)) == 0) { // no more input or timer events in the message queue, we can allow posted events to be sent normally now if (d->sendPostedEventsWindowsTimerId != 0) { |