diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-09-08 10:57:25 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-09-08 10:57:25 (GMT) |
| commit | 1af67c36b6064dfb4ec51217993c6a99ead493c9 (patch) | |
| tree | 7c6de455791d94b4047edbce4484711fd5d9d6d4 | |
| parent | 296bba454805d7f8a75acc1178fd69b96700fb73 (diff) | |
| download | Qt-1af67c36b6064dfb4ec51217993c6a99ead493c9.zip Qt-1af67c36b6064dfb4ec51217993c6a99ead493c9.tar.gz Qt-1af67c36b6064dfb4ec51217993c6a99ead493c9.tar.bz2 | |
Fix compilation on Windows CE
Manual conflict resolution accidentally turned an #ifndef Q_OS_WINCE into
an #ifdef Q_OS_WINCE, causing a build failure.
Reviewed-by: TrustMe
| -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 0a1d464..153ccdf 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -522,7 +522,7 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp) MSG unused; if ((HIWORD(GetQueueStatus(QS_INPUT | QS_RAWINPUT)) == 0 && PeekMessage(&unused, 0, WM_TIMER, WM_TIMER, PM_NOREMOVE) == 0) -#ifdef Q_OS_WINCE +#ifndef Q_OS_WINCE || GetMessageTime() - d->lastMessageTime >= 10 #endif ) { |