1 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index a1b2b64ae2..8b963117ed 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -241,7 +241,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);
@@ -919,7 +919,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);
@@ -928,7 +928,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()));
     }
 
@@ -1007,7 +1007,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);
@@ -1491,11 +1491,11 @@ void tst_QQuickPathView::undefinedPath()
 
     // QPainterPath warnings are only received if QT_NO_DEBUG is not defined
     if (QLibraryInfo::isDebugBuild()) {
-        QString warning1("QPainterPath::moveTo: Adding point where x or y is NaN or Inf, ignoring call");
-        QTest::ignoreMessage(QtWarningMsg,qPrintable(warning1));
+        QRegularExpression warning1("^QPainterPath::moveTo:.*ignoring call$");
+        QTest::ignoreMessage(QtWarningMsg, warning1);
 
-        QString warning2("QPainterPath::lineTo: Adding point where x or y is NaN or Inf, ignoring call");
-        QTest::ignoreMessage(QtWarningMsg,qPrintable(warning2));
+        QRegularExpression warning2("^QPainterPath::lineTo:.*ignoring call$");
+        QTest::ignoreMessage(QtWarningMsg, warning2);
     }
 
     QQmlComponent c(&engine, testFileUrl("undefinedpath.qml"));
@@ -1648,7 +1648,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);
@@ -1656,7 +1656,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);
 
@@ -1709,7 +1709,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);
@@ -1798,7 +1798,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);
@@ -1807,7 +1807,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);
     }