Cocoa: Fix compile when using QT_NO_TABLETEVENT
Change-Id: I76f08d747009a5bf2c0e8004c3443e16e83b6a7d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
parent
75b323c30e
commit
dbaa4de28e
@ -133,9 +133,11 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper));
|
||||
- (void)otherMouseUp:(NSEvent *)theEvent;
|
||||
- (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent;
|
||||
|
||||
#ifndef QT_NO_TABLETEVENT
|
||||
- (bool)handleTabletEvent: (NSEvent *)theEvent;
|
||||
- (void)tabletPoint: (NSEvent *)theEvent;
|
||||
- (void)tabletProximity: (NSEvent *)theEvent;
|
||||
#endif
|
||||
|
||||
- (int) convertKeyCode : (QChar)keyCode;
|
||||
+ (Qt::KeyboardModifiers) convertKeyModifiers : (ulong)modifierFlags;
|
||||
|
@ -644,10 +644,12 @@ static bool _q_dontOverrideCtrlLMB = false;
|
||||
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;
|
||||
@ -1041,6 +1043,7 @@ static bool _q_dontOverrideCtrlLMB = false;
|
||||
m_platformWindow->m_enterLeaveTargetWindow = 0;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_TABLETEVENT
|
||||
struct QCocoaTabletDeviceData
|
||||
{
|
||||
QTabletEvent::TabletDevice device;
|
||||
@ -1211,6 +1214,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
|
||||
QWindowSystemInterface::handleTabletLeaveProximityEvent(timestamp, deviceData.device, deviceData.pointerType, deviceData.uid);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
- (bool)shouldSendSingleTouch
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user