diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 03:04:11 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 03:04:11 +0100 |
commit | 41416a2a88aa03a38c05d31ebce87d8644107389 (patch) | |
tree | 99525bd2a6c88254e5f53e8b4cbd884b94101f59 | |
parent | eaf72c8ffdcdc6e9a3e1e3d67bf09db1dabe7af6 (diff) | |
parent | f7e035446355d9cb90141e508b5d33e019e14add (diff) | |
download | qtwayland-41416a2a88aa03a38c05d31ebce87d8644107389.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9ee503ea5150a80b1fd748b841b99521d323bcd9
-rw-r--r-- | src/client/qwaylandinputdevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index 56809f77..d33b0db8 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -1391,7 +1391,7 @@ void QWaylandInputDevice::Touch::touch_cancel() void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, const QPointF &surfacePosition) { auto end = mTouch->mPendingTouchPoints.end(); - auto it = std::find_if(mTouch->mPendingTouchPoints.begin(), end, [id](auto tp){ return tp.id == id; }); + auto it = std::find_if(mTouch->mPendingTouchPoints.begin(), end, [id](const QWindowSystemInterface::TouchPoint &tp){ return tp.id == id; }); if (it == end) { it = mTouch->mPendingTouchPoints.insert(end, QWindowSystemInterface::TouchPoint()); it->id = id; |