aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickpopup.cpp
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-07-17 10:52:46 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-08-11 16:00:42 +0200
commitb348cac075ad4ad39cb941a325671909a9ce2692 (patch)
tree62ac0707ace4657176dbb91dec250f3dde9e418d /src/quicktemplates2/qquickpopup.cpp
parent343572a86dbc0543d51e2fc5df6924d15d9d008f (diff)
Fix event refactoring warnings and errors
Change-Id: I426b4f75066c9db72759398e4d76fd5323044d57 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r--src/quicktemplates2/qquickpopup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 1d6f125e..57b93036 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -313,7 +313,7 @@ bool QQuickPopupPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
if (point.id() == touchId)
return true;
- if (touchId == -1 && point.state() != Qt::TouchPointReleased) {
+ if (touchId == -1 && point.state() != QEventPoint::Released) {
touchId = point.id();
return true;
}
@@ -395,11 +395,11 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event)
return blockInput(item, point.position());
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
return handlePress(item, item->mapToScene(point.position()), event->timestamp());
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
return handleMove(item, item->mapToScene(point.position()), event->timestamp());
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
return handleRelease(item, item->mapToScene(point.position()), event->timestamp());
default:
break;