diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-11 14:24:48 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-12 12:34:44 (GMT) |
| commit | 49228260b8a70a8177c5eb89b73ed6f3a07b7cc9 (patch) | |
| tree | c1fd3f1b1ace30d4db11809ec7890d01d2bbe63f /src/gui/kernel | |
| parent | 43233652e753ffa2b97a8b6d56ae53bb02cbad6b (diff) | |
| download | Qt-49228260b8a70a8177c5eb89b73ed6f3a07b7cc9.zip Qt-49228260b8a70a8177c5eb89b73ed6f3a07b7cc9.tar.gz Qt-49228260b8a70a8177c5eb89b73ed6f3a07b7cc9.tar.bz2 | |
Ignore touch and gesture events when excluding input events
When asked to exclude input events when processing events in the event
dispatcher we should also exclude touch and gesture events on Windows and Mac.
Reviewed-by: Bradley T. Hughes
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_mac.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index c7c7caf..0b3d62f 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -492,6 +492,14 @@ static bool IsMouseOrKeyEvent( NSEvent* event ) case NSOtherMouseDown: case NSOtherMouseUp: case NSOtherMouseDragged: +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + case NSEventTypeGesture: // touch events + case NSEventTypeMagnify: + case NSEventTypeSwipe: + case NSEventTypeRotate: + case NSEventTypeBeginGesture: + case NSEventTypeEndGesture: +#endif result = true; break; |