diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 07:12:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 07:12:38 (GMT) |
| commit | d27772682d54d5d70c3e9231a63c61727123754a (patch) | |
| tree | b365e820b765b7c9e68444ad87b4ff9e76894057 /src/corelib/kernel/qeventdispatcher_win.cpp | |
| parent | 34761e25b13bb2af27e9701a04ce0bf31d84c489 (diff) | |
| parent | 4feb76480213eabb38dde410c81c1f9d27ed6af0 (diff) | |
| download | Qt-d27772682d54d5d70c3e9231a63c61727123754a.zip Qt-d27772682d54d5d70c3e9231a63c61727123754a.tar.gz Qt-d27772682d54d5d70c3e9231a63c61727123754a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_win.cpp')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index cbc87f3..93becc8 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -68,6 +68,14 @@ extern uint qGlobalPostedEventsCount(); # define QS_RAWINPUT 0x0400 #endif +#ifndef WM_TOUCH +# define WM_TOUCH 0x0240 +#endif +#ifndef WM_GESTURE +# define WM_GESTURE 0x0119 +# define WM_GESTURENOTIFY 0x011A +#endif + enum { WM_QT_SOCKETNOTIFIER = WM_USER, WM_QT_SENDPOSTEDEVENTS = WM_USER + 1, @@ -714,6 +722,9 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) && msg.message <= WM_MOUSELAST) || msg.message == WM_MOUSEWHEEL || msg.message == WM_MOUSEHWHEEL + || msg.message == WM_TOUCH + || msg.message == WM_GESTURE + || msg.message == WM_GESTURENOTIFY || msg.message == WM_CLOSE)) { // queue user input events for later processing haveMessage = false; |