Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl5.15

Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9

1 files changed, 2 insertions, 5 deletions

diff --git a/src/plugins/platforms/cocoa/qnsview_tablet.mm b/src/plugins/platforms/cocoa/qnsview_tablet.mm
index ba1fa55892..f365403502 100644
--- a/src/plugins/platforms/cocoa/qnsview_tablet.mm
+++ b/src/plugins/platforms/cocoa/qnsview_tablet.mm
@@ -148,9 +148,6 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
         device = QTabletEvent::Stylus;
     } else {
         switch (bits & 0x0F06) {
-            case 0x0802:
-                device = QTabletEvent::Stylus;
-                break;
             case 0x0902:
                 device = QTabletEvent::Airbrush;
                 break;
@@ -163,8 +160,8 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
             case 0x0804:
                 device = QTabletEvent::RotationStylus;
                 break;
-            default:
-                device = QTabletEvent::NoDevice;
+            default: // usually 0x0802, but 0 on iPad sidecar with Apple Pencil
+                device = QTabletEvent::Stylus;
         }
     }
     return device;