From 05dc0a387ae324f2d6f3d7e633a0a49473f6957a Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 16 Sep 2020 22:22:24 +0200 Subject: Get rid of QMutableEventPoint::stationaryWithModifiedProperty Omitting stationary points from touch events is such a marginal optimization that this code probably isn't worth maintaining. It wasn't implemented correctly this time either, according to the tst_QQuickMultiPointTouchArea::stationaryTouchWithChangingPressure() test. Task-number: QTBUG-77142 Change-Id: I1ccc8ffe0451d6417add2b03c063ac1aebe36e8e Reviewed-by: Shawn Rutledge --- src/quick/items/qquickmultipointtoucharea.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickmultipointtoucharea.cpp') diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 37fc928aee..23cf6c0351 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -638,8 +638,8 @@ void QQuickMultiPointTouchArea::updateTouchData(QEvent *event) addTouchPoint(&p); started = true; } else if ((touchPointState & QEventPoint::State::Updated) || - QMutableEventPoint::from(p).stationaryWithModifiedProperty()) { - // React to a stationary point with a property change (velocity, pressure) as if the point moved. (QTBUG-77142) + (touchPointState & QEventPoint::State::Stationary)) { + // React to a stationary point as if the point moved. (QTBUG-77142) QQuickTouchPoint* dtp = static_cast(_touchPoints.value(id)); Q_ASSERT(dtp); _movedTouchPoints.append(dtp); -- cgit v1.2.3