1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cocoa: Fix compile when using QT_NO_TABLETEVENT

Browse Source 
Change-Id: I76f08d747009a5bf2c0e8004c3443e16e83b6a7d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Andy Shaw 2017-08-21 11:23:14 +02:00
parent 75b323c30e
commit dbaa4de28e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qnsview.h
View File

@ -133,9 +133,11 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper));
- (void)otherMouseUp:(NSEvent *)theEvent; - (void)otherMouseUp:(NSEvent *)theEvent;
- (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent; - (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent;
#ifndef QT_NO_TABLETEVENT
- (bool)handleTabletEvent: (NSEvent *)theEvent; - (bool)handleTabletEvent: (NSEvent *)theEvent;
- (void)tabletPoint: (NSEvent *)theEvent; - (void)tabletPoint: (NSEvent *)theEvent;
- (void)tabletProximity: (NSEvent *)theEvent; - (void)tabletProximity: (NSEvent *)theEvent;
#endif
- (int) convertKeyCode : (QChar)keyCode; - (int) convertKeyCode : (QChar)keyCode;
+ (Qt::KeyboardModifiers) convertKeyModifiers : (ulong)modifierFlags; + (Qt::KeyboardModifiers) convertKeyModifiers : (ulong)modifierFlags;

4
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -644,10 +644,12 @@ static bool _q_dontOverrideCtrlLMB = false;
if (!m_platformWindow) if (!m_platformWindow)
return; return;
#ifndef QT_NO_TABLETEVENT
// Tablet events may come in via the mouse event handlers, // Tablet events may come in via the mouse event handlers,
// check if this is a valid tablet event first. // check if this is a valid tablet event first.
if ([self handleTabletEvent: theEvent]) if ([self handleTabletEvent: theEvent])
return; return;
#endif
QPointF qtWindowPoint; QPointF qtWindowPoint;
QPointF qtScreenPoint; QPointF qtScreenPoint;
@ -1041,6 +1043,7 @@ static bool _q_dontOverrideCtrlLMB = false;
m_platformWindow->m_enterLeaveTargetWindow = 0; m_platformWindow->m_enterLeaveTargetWindow = 0;
} }
#ifndef QT_NO_TABLETEVENT
struct QCocoaTabletDeviceData struct QCocoaTabletDeviceData
{ {
QTabletEvent::TabletDevice device; QTabletEvent::TabletDevice device;
@ -1211,6 +1214,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
QWindowSystemInterface::handleTabletLeaveProximityEvent(timestamp, deviceData.device, deviceData.pointerType, deviceData.uid); QWindowSystemInterface::handleTabletLeaveProximityEvent(timestamp, deviceData.device, deviceData.pointerType, deviceData.uid);
} }
} }
#endif
- (bool)shouldSendSingleTouch - (bool)shouldSendSingleTouch
{ {