diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-22 16:59:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 16:07:44 +0100 |
| commit | 55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 (patch) | |
| tree | 35517eeb69916fed3e8e803cf4bd190125f538b6 /tests/auto/quick/touchmouse | |
| parent | 367cf77cd64f1b72496cde5484554ff7a8134f1d (diff) | |
Renamed QQuickItem::pos property to position
Abbreviated property names are less descriptive so we don't have
many of them. Might as well be consistent. QWindow::pos was already
renamed.
Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto/quick/touchmouse')
| -rw-r--r-- | tests/auto/quick/touchmouse/tst_touchmouse.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index 0590bd89eb..1af70e3464 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -703,7 +703,7 @@ void tst_TouchMouse::pinchOnFlickable() QVERIFY(flickable->contentX() == 0.0); QPoint p = QPoint(100, 100); QTest::touchEvent(window, device).press(0, p, window); - QCOMPARE(rect->pos(), QPointF(200.0, 200.0)); + QCOMPARE(rect->position(), QPointF(200.0, 200.0)); p -= QPoint(10, 0); QTest::touchEvent(window, device).move(0, p, window); p -= QPoint(10, 0); @@ -770,7 +770,7 @@ void tst_TouchMouse::flickableOnPinch() QVERIFY(flickable->contentX() == 0.0); QPoint p = QPoint(100, 100); QTest::touchEvent(window, device).press(0, p, window); - QCOMPARE(rect->pos(), QPointF(200.0, 200.0)); + QCOMPARE(rect->position(), QPointF(200.0, 200.0)); p -= QPoint(10, 0); QTest::touchEvent(window, device).move(0, p, window); p -= QPoint(10, 0); @@ -785,7 +785,7 @@ void tst_TouchMouse::flickableOnPinch() QTest::qWait(1000); //QVERIFY(flickable->isMovingHorizontally()); - qDebug() << "Pos: " << rect->pos(); + qDebug() << "Pos: " << rect->position(); // wait until flicking is done QTRY_VERIFY(!flickable->isFlicking()); @@ -839,7 +839,7 @@ void tst_TouchMouse::mouseOnFlickableOnPinch() QVERIFY(flickable->contentX() == 0.0); QPoint p = QPoint(100, 100); QTest::touchEvent(window, device).press(0, p, window); - QCOMPARE(rect->pos(), QPointF(200.0, 200.0)); + QCOMPARE(rect->position(), QPointF(200.0, 200.0)); p -= QPoint(10, 0); QTest::touchEvent(window, device).move(0, p, window); p -= QPoint(10, 0); @@ -851,7 +851,7 @@ void tst_TouchMouse::mouseOnFlickableOnPinch() QGuiApplication::processEvents(); //QVERIFY(flickable->isMovingHorizontally()); - qDebug() << "Pos: " << rect->pos(); + qDebug() << "Pos: " << rect->position(); // pinch QPoint p1 = QPoint(40, 20); @@ -885,7 +885,7 @@ void tst_TouchMouse::mouseOnFlickableOnPinch() flickable->setContentX(0.0); p = QPoint(100, 100); pinchSequence.press(0, p, window).commit(); - QCOMPARE(rect->pos(), QPointF(200.0, 200.0)); + QCOMPARE(rect->position(), QPointF(200.0, 200.0)); p -= QPoint(10, 0); pinchSequence.move(0, p, window).commit(); p -= QPoint(10, 0); |