diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-29 17:12:32 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-18 20:56:19 +0200 |
| commit | 39f4d687fc37f48cbc181f42797c42be91b4a345 (patch) | |
| tree | 3051d8606c875cfe152436c0940ea515864baa9d /src | |
| parent | 78c808fbfb1920894e00082c04864ed58ddeb2ac (diff) | |
Remove the pointId += deviceId << 24 hack
1204ed14dc11e6343a569646428a7ffddd098f8c did this in some places but
not others. Now we remove the remaining vestiges when delivering
mouse and tablet events.
Change-Id: I0aaecab49543ad65952d84f375e78936d737483e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 6500bb0bcc..96527d955b 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2429,8 +2429,6 @@ void QQuickWindow::tabletEvent(QTabletEvent *event) { Q_D(QQuickWindow); qCDebug(lcTablet) << event; - const int deviceIndex = QInputDevice::devices().indexOf(event->device()); - QMutableSinglePointEvent::from(event)->mutablePoint().setId((deviceIndex << 24) + event->point(0).id()); // TODO Qt 6: make sure TabletEnterProximity and TabletLeaveProximity are delivered here d->deliverPointerEvent(d->pointerEventInstance(event)); } @@ -2588,8 +2586,6 @@ void QQuickWindowPrivate::handleMouseEvent(QMouseEvent *event) return; } qCDebug(DBG_MOUSE) << event; - const int deviceIndex = QInputDevice::devices().indexOf(event->device()); - QMutableSinglePointEvent::from(event)->mutablePoint().setId((deviceIndex << 24) + event->point(0).id()); switch (event->type()) { case QEvent::MouseButtonPress: |