From 55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 22 Oct 2012 16:59:25 +0200 Subject: Renamed QQuickItem::pos property to position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/quick/qquickdroparea') diff --git a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp index 927a57b296..ef804a9fc6 100644 --- a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp +++ b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp @@ -145,14 +145,14 @@ void tst_QQuickDropArea::containsDrag_internal() evaluate(dropArea, "{ enterEvents = 0; exitEvents = 0 }"); - dragItem->setPos(QPointF(150, 50)); + dragItem->setPosition(QPointF(150, 50)); evaluate(dragItem, "Drag.active = true"); QCOMPARE(evaluate(dropArea, "containsDrag"), false); QCOMPARE(evaluate(dropArea, "hasDrag"), false); QCOMPARE(evaluate(dropArea, "enterEvents"), 0); QCOMPARE(evaluate(dropArea, "exitEvents"), 0); - dragItem->setPos(QPointF(50, 50)); + dragItem->setPosition(QPointF(50, 50)); QCoreApplication::processEvents(); QCOMPARE(evaluate(dropArea, "containsDrag"), true); QCOMPARE(evaluate(dropArea, "hasDrag"), true); @@ -160,7 +160,7 @@ void tst_QQuickDropArea::containsDrag_internal() QCOMPARE(evaluate(dropArea, "exitEvents"), 0); evaluate(dropArea, "{ enterEvents = 0; exitEvents = 0 }"); - dragItem->setPos(QPointF(150, 50)); + dragItem->setPosition(QPointF(150, 50)); QCoreApplication::processEvents(); QCOMPARE(evaluate(dropArea, "containsDrag"), false); @@ -544,7 +544,7 @@ void tst_QQuickDropArea::position_internal() QCOMPARE(evaluate(dropArea, "eventY"), qreal(50)); evaluate(dropArea, "{ enterEvents = 0; moveEvents = 0; eventX = -1; eventY = -1 }"); - dragItem->setPos(QPointF(40, 50)); + dragItem->setPosition(QPointF(40, 50)); QCoreApplication::processEvents(); QCOMPARE(evaluate(dropArea, "enterEvents"), 0); QCOMPARE(evaluate(dropArea, "moveEvents"), 1); @@ -556,7 +556,7 @@ void tst_QQuickDropArea::position_internal() QCOMPARE(evaluate(dropArea, "eventY"), qreal(50)); evaluate(dropArea, "{ enterEvents = 0; moveEvents = 0; eventX = -1; eventY = -1 }"); - dragItem->setPos(QPointF(75, 25)); + dragItem->setPosition(QPointF(75, 25)); QCoreApplication::processEvents(); QCOMPARE(evaluate(dropArea, "enterEvents"), 0); QCOMPARE(evaluate(dropArea, "moveEvents"), 1); -- cgit v1.2.3