diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 3f87c21f51..bbd7cb22a0 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -81,7 +81,7 @@ public: touchBeginPoints = touchEvent->points(); Q_ASSERT(touchBeginPoints.first().device() == touchEvent->pointingDevice()); for (const QEventPoint &pt : qAsConst(touchBeginPoints)) - lastNormalizedPositions << pt.normalizedPos(); + lastNormalizedPositions << pt.normalizedPosition(); timestamp = touchEvent->timestamp(); deviceFromEvent = touchEvent->pointingDevice(); event->setAccepted(acceptTouchBegin); @@ -97,7 +97,7 @@ public: auto touchEvent = static_cast<QTouchEvent *>(event); touchUpdatePoints = touchEvent->points(); for (const QEventPoint &pt : qAsConst(touchUpdatePoints)) - lastNormalizedPositions << pt.normalizedPos(); + lastNormalizedPositions << pt.normalizedPosition(); timestamp = touchEvent->timestamp(); deviceFromEvent = touchEvent->pointingDevice(); event->setAccepted(acceptTouchUpdate); @@ -113,7 +113,7 @@ public: auto touchEvent = static_cast<QTouchEvent *>(event); touchEndPoints = touchEvent->points(); for (const QEventPoint &pt : qAsConst(touchEndPoints)) - lastNormalizedPositions << pt.normalizedPos(); + lastNormalizedPositions << pt.normalizedPosition(); timestamp = touchEvent->timestamp(); deviceFromEvent = touchEvent->pointingDevice(); event->setAccepted(acceptTouchEnd); @@ -702,11 +702,6 @@ void tst_QTouchEvent::touchUpdateAndEndNeverPropagate() } } -QPointF normalized(const QPointF &pos, const QRectF &rect) -{ - return QPointF(pos.x() / rect.width(), pos.y() / rect.height()); -} - void tst_QTouchEvent::basicRawEventTranslation() { tst_QTouchEventWidget touchWidget; |