diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-08 14:25:33 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-09 20:59:53 +0200 |
| commit | d5c5357c896542b82cac386ab3a734df14dc02db (patch) | |
| tree | 5baed7beb458279fbfc2fb80a0515df0ba84b363 | |
| parent | 0f19f571ee307dbe5fdebeb489d0c6cfcc8fa5ef (diff) | |
Replace QInputDevice::id() with systemId()
Required after qtbase c7c28b340662915a9f8fdb84c0a94c458fe6a290.
Change-Id: Ife9efbf802e1e8984a950fa255e8917e2398cc7a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index d380eb1142..4b51373837 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -1246,7 +1246,7 @@ QQuickPointerEvent *QQuickPointerMouseEvent::reset(QEvent *event) break; } // for now, reuse the device ID as the point ID; TODO use ev->point(0).id when it becomes possible - m_point->reset(state, ev->scenePosition(), int(ev->device()->id()), ev->timestamp()); + m_point->reset(state, ev->scenePosition(), int(ev->device()->systemId()), ev->timestamp()); return this; } @@ -1356,7 +1356,7 @@ QQuickPointerEvent *QQuickPointerNativeGestureEvent::reset(QEvent *event) default: break; } - quint64 deviceId = ev->device()->id(); + quint64 deviceId = ev->device()->systemId(); m_point->reset(state, ev->scenePosition(), deviceId << 24, ev->timestamp()); return this; } diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index afbd87c1c4..30c3ae9b63 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1924,7 +1924,7 @@ bool QQuickWindowPrivate::clearHover(ulong timestamp) pos = q->mapFromGlobal(QCursor::pos()); const auto dev = QPointingDevice::primaryPointingDevice(); QQuickPointerEvent *pointerEvent = pointerEventInstance(dev, QEvent::MouseMove); - pointerEvent->point(0)->reset(Qt::TouchPointMoved, pos, int(dev->id()), timestamp, QVector2D()); + pointerEvent->point(0)->reset(Qt::TouchPointMoved, pos, int(dev->systemId()), timestamp, QVector2D()); pointerEvent->point(0)->setAccepted(true); pointerEvent->localize(item); for (QQuickPointerHandler *h : itemPrivate->extra->pointerHandlers) @@ -2273,7 +2273,7 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce if (itemPrivate->hasPointerHandlers()) { const auto dev = QPointingDevice::primaryPointingDevice(); QQuickPointerEvent *pointerEvent = pointerEventInstance(dev, QEvent::MouseMove); - pointerEvent->point(0)->reset(Qt::TouchPointMoved, scenePos, dev->id(), timestamp, QVector2D()); + pointerEvent->point(0)->reset(Qt::TouchPointMoved, scenePos, dev->systemId(), timestamp, QVector2D()); pointerEvent->point(0)->setAccepted(true); pointerEvent->localize(item); for (QQuickPointerHandler *h : itemPrivate->extra->pointerHandlers) |