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/qquickdroparea | |
| 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/qquickdroparea')
| -rw-r--r-- | tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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<void>(dropArea, "{ enterEvents = 0; exitEvents = 0 }"); - dragItem->setPos(QPointF(150, 50)); + dragItem->setPosition(QPointF(150, 50)); evaluate<void>(dragItem, "Drag.active = true"); QCOMPARE(evaluate<bool>(dropArea, "containsDrag"), false); QCOMPARE(evaluate<bool>(dropArea, "hasDrag"), false); QCOMPARE(evaluate<int>(dropArea, "enterEvents"), 0); QCOMPARE(evaluate<int>(dropArea, "exitEvents"), 0); - dragItem->setPos(QPointF(50, 50)); + dragItem->setPosition(QPointF(50, 50)); QCoreApplication::processEvents(); QCOMPARE(evaluate<bool>(dropArea, "containsDrag"), true); QCOMPARE(evaluate<bool>(dropArea, "hasDrag"), true); @@ -160,7 +160,7 @@ void tst_QQuickDropArea::containsDrag_internal() QCOMPARE(evaluate<int>(dropArea, "exitEvents"), 0); evaluate<void>(dropArea, "{ enterEvents = 0; exitEvents = 0 }"); - dragItem->setPos(QPointF(150, 50)); + dragItem->setPosition(QPointF(150, 50)); QCoreApplication::processEvents(); QCOMPARE(evaluate<bool>(dropArea, "containsDrag"), false); @@ -544,7 +544,7 @@ void tst_QQuickDropArea::position_internal() QCOMPARE(evaluate<qreal>(dropArea, "eventY"), qreal(50)); evaluate<void>(dropArea, "{ enterEvents = 0; moveEvents = 0; eventX = -1; eventY = -1 }"); - dragItem->setPos(QPointF(40, 50)); + dragItem->setPosition(QPointF(40, 50)); QCoreApplication::processEvents(); QCOMPARE(evaluate<int>(dropArea, "enterEvents"), 0); QCOMPARE(evaluate<int>(dropArea, "moveEvents"), 1); @@ -556,7 +556,7 @@ void tst_QQuickDropArea::position_internal() QCOMPARE(evaluate<qreal>(dropArea, "eventY"), qreal(50)); evaluate<void>(dropArea, "{ enterEvents = 0; moveEvents = 0; eventX = -1; eventY = -1 }"); - dragItem->setPos(QPointF(75, 25)); + dragItem->setPosition(QPointF(75, 25)); QCoreApplication::processEvents(); QCOMPARE(evaluate<int>(dropArea, "enterEvents"), 0); QCOMPARE(evaluate<int>(dropArea, "moveEvents"), 1); |