diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:03:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:03:15 +0200 |
| commit | fc6ee24ac1bf94ca99b6629f00d047131d424e87 (patch) | |
| tree | b55885d34dc9ba49c880467ec823dd4674a6733e /src/client/qwaylandinputdevice_p.h | |
| parent | 7fa3a9c2f181323513733ceaac196579730be600 (diff) | |
| parent | da371debb1bcc4a22c5157b0d8a2e09a7cb7ce1b (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3bbf053a35ceee52d9953a676bacec2b9299bad5
Diffstat (limited to 'src/client/qwaylandinputdevice_p.h')
| -rw-r--r-- | src/client/qwaylandinputdevice_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h index 7fbb5667f..60d6f2c17 100644 --- a/src/client/qwaylandinputdevice_p.h +++ b/src/client/qwaylandinputdevice_p.h @@ -188,7 +188,7 @@ private: uint32_t mSerial = 0; void seat_capabilities(uint32_t caps) override; - void handleTouchPoint(int id, double x, double y, Qt::TouchPointState state); + void handleTouchPoint(int id, Qt::TouchPointState state, const QPointF &surfacePosition = QPoint()); QTouchDevice *mTouchDevice = nullptr; @@ -389,8 +389,7 @@ public: QWaylandInputDevice *mParent = nullptr; QPointer<QWaylandWindow> mFocus; - QList<QWindowSystemInterface::TouchPoint> mTouchPoints; - QList<QWindowSystemInterface::TouchPoint> mPrevTouchPoints; + QList<QWindowSystemInterface::TouchPoint> mPendingTouchPoints; }; class QWaylandPointerEvent |