diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:09 +0200 |
| commit | 9831118378c5d489f76089011277a1b7234a8d68 (patch) | |
| tree | a67e82fde179fa727172fff9098758d60912189d /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
| parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) | |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 666b3fe445..f75ee59142 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -461,10 +461,12 @@ static QTouchDevice *touchDevice = 0; if (!m_platformWindow) return; +#ifndef QT_NO_TABLETEVENT // Tablet events may come in via the mouse event handlers, // check if this is a valid tablet event first. if ([self handleTabletEvent: theEvent]) return; +#endif QPointF qtWindowPoint; QPointF qtScreenPoint; @@ -861,6 +863,7 @@ static QTouchDevice *touchDevice = 0; m_platformWindow->m_enterLeaveTargetWindow = 0; } +#ifndef QT_NO_TABLETEVENT struct QCocoaTabletDeviceData { QTabletEvent::TabletDevice device; @@ -1031,6 +1034,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) QWindowSystemInterface::handleTabletLeaveProximityEvent(timestamp, deviceData.device, deviceData.pointerType, deviceData.uid); } } +#endif - (bool)shouldSendSingleTouch { |