diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:16 +0200 |
| commit | 64e6eaf559395ee96232db69e0261c4a183e1fb7 (patch) | |
| tree | 18b719b7746e0c70ae70546931e43b364d774716 /src/client/qwaylandinputdevice_p.h | |
| parent | 53ab5e7748340f922f7f32c7d2db4965aa8c2ff2 (diff) | |
| parent | ac80dfb5b921437b699a992d1f211e8edf4d7844 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I5d587b79b96d2b44f1975419a658c259c63fa30d
Diffstat (limited to 'src/client/qwaylandinputdevice_p.h')
| -rw-r--r-- | src/client/qwaylandinputdevice_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h index 39ca9dca5..b0b022161 100644 --- a/src/client/qwaylandinputdevice_p.h +++ b/src/client/qwaylandinputdevice_p.h @@ -333,8 +333,7 @@ public: QWaylandInputDevice *mParent = nullptr; QPointer<QWaylandWindow> mFocus; - QList<QWindowSystemInterface::TouchPoint> mTouchPoints; - QList<QWindowSystemInterface::TouchPoint> mPrevTouchPoints; + QList<QWindowSystemInterface::TouchPoint> mPendingTouchPoints; }; class QWaylandPointerEvent |