aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2017-09-03 18:42:09 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2017-09-05 11:52:48 +0000
commit2617ac5b9df7dfdecf0cb02d5933c40df1a55bbc (patch)
treeb14cbc0f7335a0397e09014e1953213d086b9ffa /tests
parentbe3559470ac934dcfed881996be0eeb1269e6f96 (diff)
rename QQuickEventPoint pos properties to position
For consistency we always spell it out, although it does make some of these properties inconveniently verbose. Change-Id: I64a08c3aa261c0ab89e09472dd47510abafbf7ca Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp4
-rw-r--r--tests/auto/quick/qquickwindow/tst_qquickwindow.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
index bb4361255c..cc39dd54f7 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp
@@ -200,7 +200,7 @@ class EventHandler : public QQuickPointerHandler
item->eventList.append(Event(Event::HandlerDestination, QEvent::Pointer,
static_cast<Qt::TouchPointState>(point->state()),
item->grabPointer ? (int)QQuickEventPoint::GrabExclusive : (int)NoGrab,
- eventPos(point), point->scenePos()));
+ eventPos(point), point->scenePosition()));
}
}
@@ -208,7 +208,7 @@ class EventHandler : public QQuickPointerHandler
{
EventItem *item = static_cast<EventItem *>(target());
item->eventList.append(Event(Event::HandlerDestination, QEvent::None,
- static_cast<Qt::TouchPointState>(point->state()), stateChange, eventPos(point), point->scenePos()));
+ static_cast<Qt::TouchPointState>(point->state()), stateChange, eventPos(point), point->scenePosition()));
}
};
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 5ae82423f9..692e01c125 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -2674,7 +2674,7 @@ void tst_qquickwindow::pointerEventTypeAndPointCount()
QVERIFY(!pme.asPointerTabletEvent());
// QVERIFY(!pe->asTabletEvent()); // TODO
QCOMPARE(pme.pointCount(), 1);
- QCOMPARE(pme.point(0)->scenePos(), scenePosition);
+ QCOMPARE(pme.point(0)->scenePosition(), scenePosition);
QCOMPARE(pme.asMouseEvent(localPosition)->localPos(), localPosition);
QCOMPARE(pme.asMouseEvent(localPosition)->screenPos(), screenPosition);