diff options
Diffstat (limited to 'tests/auto/quick/qquickpathview/tst_qquickpathview.cpp')
| -rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index e2d3253e44..4498548d45 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -39,7 +39,7 @@ #include <QtQuick/private/qquicktext_p.h> #include <QtQuick/private/qquickrectangle_p.h> #include <QtQuickTest/QtQuickTest> -#include <QtQml/private/qqmllistmodel_p.h> +#include <QtQmlModels/private/qqmllistmodel_p.h> #include <QtQml/private/qqmlvaluetype_p.h> #include <QtGui/qstandarditemmodel.h> #include <QStringListModel> @@ -242,7 +242,7 @@ void tst_QQuickPathView::items() QVERIFY(path); QVERIFY(pathview->highlightItem()); - QPointF start = path->pointAt(0.0); + QPointF start = path->pointAtPercent(0.0); QPointF offset; offset.setX(pathview->highlightItem()->width()/2); offset.setY(pathview->highlightItem()->height()/2); @@ -920,7 +920,7 @@ void tst_QQuickPathView::pathMoved() QVERIFY(firstItem); QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path()); QVERIFY(path); - QPointF start = path->pointAt(0.0); + QPointF start = path->pointAtPercent(0.0); QPointF offset;//Center of item is at point, but pos is from corner offset.setX(firstItem->width()/2); offset.setY(firstItem->height()/2); @@ -929,7 +929,7 @@ void tst_QQuickPathView::pathMoved() for (int i=0; i<model.count(); i++) { QQuickRectangle *curItem = findItem<QQuickRectangle>(pathview, "wrapper", i); - QPointF itemPos(path->pointAt(0.25 + i*0.25)); + QPointF itemPos(path->pointAtPercent(0.25 + i*0.25)); QCOMPARE(curItem->position() + offset, QPointF(itemPos.x(), itemPos.y())); } @@ -1008,7 +1008,7 @@ void tst_QQuickPathView::setCurrentIndex() QVERIFY(firstItem); QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path()); QVERIFY(path); - QPointF start = path->pointAt(0.0); + QPointF start = path->pointAtPercent(0.0); QPointF offset;//Center of item is at point, but pos is from corner offset.setX(firstItem->width()/2); offset.setY(firstItem->height()/2); @@ -1714,7 +1714,7 @@ void tst_QQuickPathView::changePreferredHighlight() QVERIFY(firstItem); QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path()); QVERIFY(path); - QPointF start = path->pointAt(0.5); + QPointF start = path->pointAtPercent(0.5); QPointF offset;//Center of item is at point, but pos is from corner offset.setX(firstItem->width()/2); offset.setY(firstItem->height()/2); @@ -1722,7 +1722,7 @@ void tst_QQuickPathView::changePreferredHighlight() pathview->setPreferredHighlightBegin(0.8); pathview->setPreferredHighlightEnd(0.8); - start = path->pointAt(0.8); + start = path->pointAtPercent(0.8); QTRY_COMPARE(firstItem->position() + offset, start); QCOMPARE(pathview->currentIndex(), 0); @@ -1775,7 +1775,7 @@ void tst_QQuickPathView::currentOffsetOnInsertion() QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path()); QVERIFY(path); - QPointF start = path->pointAt(0.5); + QPointF start = path->pointAtPercent(0.5); QPointF offset;//Center of item is at point, but pos is from corner offset.setX(item->width()/2); offset.setY(item->height()/2); @@ -1864,7 +1864,7 @@ void tst_QQuickPathView::asynchronous() QVERIFY(firstItem); QQuickPath *path = qobject_cast<QQuickPath*>(pathview->path()); QVERIFY(path); - QPointF start = path->pointAt(0.0); + QPointF start = path->pointAtPercent(0.0); QPointF offset;//Center of item is at point, but pos is from corner offset.setX(firstItem->width()/2); offset.setY(firstItem->height()/2); @@ -1873,7 +1873,7 @@ void tst_QQuickPathView::asynchronous() for (int i=0; i<5; i++) { QQuickItem *curItem = findItem<QQuickItem>(pathview, "wrapper", i); - QPointF itemPos(path->pointAt(0.2 + i*0.2)); + QPointF itemPos(path->pointAtPercent(0.2 + i*0.2)); QCOMPARE(curItem->position() + offset, itemPos); } |