tests/auto/quick: remove QQUICK_VERIFY_POLISH macro

QQuickTest::qWaitForItemPolished() can be used instead now.

Change-Id: I5b531d811271024c750c669c4013865514b2ebeb
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

4 files changed, 6 insertions, 8 deletions

diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 43a94d8d9d..681088cd6f 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -2585,7 +2585,7 @@ void tst_QQuickListView::sectionDelegateChange()
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
 
-    QQUICK_VERIFY_POLISH(listview);
+    QQuickTest::qWaitForItemPolished(listview);
 
     QVERIFY(findItems<QQuickItem>(contentItem, "section1").count() > 0);
     QCOMPARE(findItems<QQuickItem>(contentItem, "section2").count(), 0);
@@ -2597,7 +2597,7 @@ void tst_QQuickListView::sectionDelegateChange()
     }
 
     QMetaObject::invokeMethod(window->rootObject(), "switchDelegates");
-    QQUICK_VERIFY_POLISH(listview);
+    QQuickTest::qWaitForItemPolished(listview);
 
     QCOMPARE(findItems<QQuickItem>(contentItem, "section1").count(), 0);
     QVERIFY(findItems<QQuickItem>(contentItem, "section2").count() > 0);
diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro
index 90c1eb0c67..f21fb64fa4 100644
--- a/tests/auto/quick/qquickpathview/qquickpathview.pro
+++ b/tests/auto/quick/qquickpathview/qquickpathview.pro
@@ -9,5 +9,5 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
-QT += core-private gui-private  qml-private quick-private testlib
+QT += core-private gui-private qml-private quick-private testlib qmltest
 qtHaveModule(widgets): QT += widgets
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index aceb61bde4..8d3abb7ce3 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -38,6 +38,7 @@
 #include <QtQuick/private/qquickpath_p.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuick/private/qquickrectangle_p.h>
+#include <QtQuickTest/QtQuickTest>
 #include <QtQml/private/qqmllistmodel_p.h>
 #include <QtQml/private/qqmlvaluetype_p.h>
 #include <QtGui/qstandarditemmodel.h>
@@ -714,13 +715,13 @@ void tst_QQuickPathView::consecutiveModelChanges()
                 pathview->setCurrentIndex(changes[i].index);
                 break;
         case ListChange::Polish:
-                QQUICK_VERIFY_POLISH(pathview);
+                QQuickTest::qWaitForItemPolished(pathview);
                 break;
             default:
                 continue;
         }
     }
-    QQUICK_VERIFY_POLISH(pathview);
+    QQuickTest::qWaitForItemPolished(pathview);
 
     QCOMPARE(findItems<QQuickItem>(pathview, "wrapper").count(), count);
     QCOMPARE(pathview->count(), count);
diff --git a/tests/auto/quick/shared/visualtestutil.h b/tests/auto/quick/shared/visualtestutil.h
index 2daf86cd83..74f9dc8cc1 100644
--- a/tests/auto/quick/shared/visualtestutil.h
+++ b/tests/auto/quick/shared/visualtestutil.h
@@ -100,7 +100,4 @@ namespace QQuickVisualTestUtil
     bool compareImages(const QImage &ia, const QImage &ib);
 }
 
-#define QQUICK_VERIFY_POLISH(item) \
-    QTRY_COMPARE(QQuickItemPrivate::get(item)->polishScheduled, false)
-
 #endif // QQUICKVISUALTESTUTIL_H