aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-07-13 13:40:04 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-07-15 20:52:59 +0200
commitc0e72e34863a5628c51e5c3bb42bcc455c310340 (patch)
tree71e661d2c54258a756087627227f4feb39521bae /src/plugins
parent151f58dc29f4b53fb46a96d773aee8641593e5c7 (diff)
Replace QTouchEvent::TouchPoint with QEventPoint
It's a cosmetic change at this time, because we have declared using TouchPoint = QEventPoint; Also replace Qt::TouchPointState enum with QEventPoint::State. Task-number: QTBUG-72173 Change-Id: Ife017aa98801c28abc6cccd106f47a95421549de Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp
index a9a3534769..24f81c73ff 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp
@@ -118,11 +118,11 @@ void InspectTool::hoverMoveEvent(QMouseEvent *event)
void InspectTool::touchEvent(QTouchEvent *event)
{
- QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
+ QList<QEventPoint> touchPoints = event->touchPoints();
switch (event->type()) {
case QEvent::TouchBegin:
- if (touchPoints.count() == 1 && (event->touchPointStates() & Qt::TouchPointPressed)) {
+ if (touchPoints.count() == 1 && (event->touchPointStates() & QEventPoint::State::Pressed)) {
m_mousePosition = touchPoints.first().position();
m_tapEvent = true;
} else {
@@ -132,7 +132,7 @@ void InspectTool::touchEvent(QTouchEvent *event)
case QEvent::TouchUpdate: {
if (touchPoints.count() > 1)
m_tapEvent = false;
- else if ((touchPoints.count() == 1) && (event->touchPointStates() & Qt::TouchPointMoved))
+ else if ((touchPoints.count() == 1) && (event->touchPointStates() & QEventPoint::State::Updated))
m_mousePosition = touchPoints.first().position();
break;
}