diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 22:46:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 22:46:38 (GMT) |
| commit | 4feb76480213eabb38dde410c81c1f9d27ed6af0 (patch) | |
| tree | e6b3d8ecc8b84fc4fee06d9d9bd79fc3eb399d59 /src/gui/kernel | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| parent | a3127c9cd9c7ff408c79685464293224b2641f43 (diff) | |
| download | Qt-4feb76480213eabb38dde410c81c1f9d27ed6af0.zip Qt-4feb76480213eabb38dde410c81c1f9d27ed6af0.tar.gz Qt-4feb76480213eabb38dde410c81c1f9d27ed6af0.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/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..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; |