From 1af67c36b6064dfb4ec51217993c6a99ead493c9 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 8 Sep 2010 12:57:25 +0200
Subject: 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
---
 src/corelib/kernel/qeventdispatcher_win.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
                 ) {
-- 
cgit v0.12