diff options
| author | Bill King <bking@trolltech.com> | 2010-02-19 04:42:37 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-19 04:42:37 (GMT) |
| commit | 5162616cbfd16fce37c1f26081cbf83f02fb5831 (patch) | |
| tree | 66b8a2a58479d438b5c71f2bff453e5357eaef46 /src/gui/kernel/qeventdispatcher_mac.mm | |
| parent | 3598150df228148c49aa5212ee42bd56c3690032 (diff) | |
| parent | 52e517b50aafd6cc0bec597abd50d8b3f7e982dd (diff) | |
| download | Qt-5162616cbfd16fce37c1f26081cbf83f02fb5831.zip Qt-5162616cbfd16fce37c1f26081cbf83f02fb5831.tar.gz Qt-5162616cbfd16fce37c1f26081cbf83f02fb5831.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_mac.mm')
| -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..df09185 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_6 + case NSEventTypeGesture: // touch events + case NSEventTypeMagnify: + case NSEventTypeSwipe: + case NSEventTypeRotate: + case NSEventTypeBeginGesture: + case NSEventTypeEndGesture: +#endif result = true; break; |