diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-04 17:07:30 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-06 10:16:31 +0100 |
| commit | 6c8f3a7f8af38299910e2389dbf2bc4cefc65af7 (patch) | |
| tree | 03d607a6016564a9dff2edc7576b69588ddb47cb /src/plugins | |
| parent | 504972f838761f79a170c22225add496e7e5af6a (diff) | |
Fix compile warning
QInputDevice data types changed from 16 bit to int in
742de50c5ec01f93cf0e193a8a131cbd913cb787
Change-Id: Id2760b5b685e5efc14ee6f9e36e2b30a5b188cdd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_tablet.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_tablet.mm b/src/plugins/platforms/cocoa/qnsview_tablet.mm index f164f81b31..804c502775 100644 --- a/src/plugins/platforms/cocoa/qnsview_tablet.mm +++ b/src/plugins/platforms/cocoa/qnsview_tablet.mm @@ -112,7 +112,7 @@ Q_GLOBAL_STATIC(QCocoaTabletDeviceDataHash, tabletDeviceDataHash) Qt::KeyboardModifiers keyboardModifiers = QCocoaKeyMapper::fromCocoaModifiers(theEvent.modifierFlags); Qt::MouseButtons buttons = ignoreButtonMapping ? static_cast<Qt::MouseButtons>(static_cast<uint>([theEvent buttonMask])) : m_buttons; - qCDebug(lcQpaTablet, "event on tablet %d with tool %hd type %hd unique ID %lld pos %6.1f, %6.1f root pos %6.1f, %6.1f buttons 0x%x pressure %4.2lf tilt %d, %d rotation %6.2lf", + qCDebug(lcQpaTablet, "event on tablet %d with tool %d type %d unique ID %lld pos %6.1f, %6.1f root pos %6.1f, %6.1f buttons 0x%x pressure %4.2lf tilt %d, %d rotation %6.2lf", deviceId, deviceData.device, deviceData.pointerType, deviceData.uid, windowPoint.x(), windowPoint.y(), screenPoint.x(), screenPoint.y(), static_cast<uint>(buttons), pressure, xTilt, yTilt, rotation); @@ -211,7 +211,7 @@ static QInputDevice::DeviceType wacomTabletDevice(NSEvent *theEvent) tabletDeviceDataHash->remove(deviceId); } - qCDebug(lcQpaTablet, "proximity change on tablet %d: current tool %hd type %hd unique ID %lld", + qCDebug(lcQpaTablet, "proximity change on tablet %d: current tool %d type %d unique ID %lld", deviceId, deviceData.device, deviceData.pointerType, deviceData.uid); if (entering) { |