Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9ee503ea5150a80b1fd748b841b99521d323bcd9
This commit is contained in:
commit
2fb685b292
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user