tst_qquicklistview: use new QQuickTest::qWaitForItemPolished() function

This is a public function that encapsulates the behavior of the old
checks without requiring use of private API.

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

1 files changed, 118 insertions, 117 deletions

diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index ff796a5bd8..43a94d8d9d 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -31,6 +31,7 @@
 #include <QtCore/QSortFilterProxyModel>
 #include <QtGui/QStandardItemModel>
 #include <QtQuick/qquickview.h>
+#include <QtQuickTest/QtQuickTest>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlexpression.h>
@@ -647,7 +648,7 @@ void tst_QQuickListView::inserted_more(QQuickItemView::VerticalLayoutDirection v
 
     if (verticalLayoutDirection == QQuickItemView::BottomToTop) {
         listview->setVerticalLayoutDirection(verticalLayoutDirection);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
         contentY = -listview->height() - contentY;
     }
     listview->setContentY(contentY);
@@ -660,7 +661,7 @@ void tst_QQuickListView::inserted_more(QQuickItemView::VerticalLayoutDirection v
     model.insertItems(insertIndex, newData);
 
     //Wait for polish (updates list to the model changes)
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QTRY_COMPARE(listview->property("count").toInt(), model.count());
 
@@ -841,7 +842,7 @@ void tst_QQuickListView::insertBeforeVisible()
     QTRY_VERIFY(contentItem != nullptr);
 
     listview->setCacheBuffer(cacheBuffer);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // trigger a refill (not just setting contentY) so that the visibleItems grid is updated
     int firstVisibleIndex = 20;     // move to an index where the top item is not visible
@@ -849,7 +850,7 @@ void tst_QQuickListView::insertBeforeVisible()
     listview->setCurrentIndex(firstVisibleIndex);
 
     qApp->processEvents();
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(listview->currentIndex(), firstVisibleIndex);
     QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", firstVisibleIndex);
     QVERIFY(item);
@@ -869,7 +870,7 @@ void tst_QQuickListView::insertBeforeVisible()
     // now, moving to the top of the view should position the inserted items correctly
     int itemsOffsetAfterMove = (removeCount - insertCount) * 20;
     listview->setCurrentIndex(0);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(listview->currentIndex(), 0);
     QTRY_COMPARE(listview->contentY(), 0.0 + itemsOffsetAfterMove);
 
@@ -952,7 +953,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     model.removeItem(1);
     QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
@@ -1031,7 +1032,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
 
     listview->setContentY(20); // That's the top now
     // let transitions settle.
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -1045,7 +1046,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
     // remove current item beyond visible items.
     listview->setCurrentIndex(20);
     listview->setContentY(40);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     model.removeItem(20);
     QTRY_COMPARE(listview->currentIndex(), 20);
@@ -1053,7 +1054,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
 
     // remove item before current, but visible
     listview->setCurrentIndex(8);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     oldCurrent = listview->currentItem();
     model.removeItem(6);
 
@@ -1061,7 +1062,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
     QTRY_COMPARE(listview->currentItem(), oldCurrent);
 
     listview->setContentY(80);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // remove all visible items
     model.removeItems(1, 18);
@@ -1139,14 +1140,14 @@ void tst_QQuickListView::removed_more(const QUrl &source, QQuickItemView::Vertic
 
     if (verticalLayoutDirection == QQuickItemView::BottomToTop) {
         listview->setVerticalLayoutDirection(verticalLayoutDirection);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
         contentY = -listview->height() - contentY;
     }
     listview->setContentY(contentY);
 
     model.removeItems(removeIndex, removeCount);
     //Wait for polish (updates list to the model changes)
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QTRY_COMPARE(listview->property("count").toInt(), model.count());
 
@@ -1320,7 +1321,7 @@ void tst_QQuickListView::clear(const QUrl &source, QQuickItemView::VerticalLayou
     QTRY_VERIFY(contentItem != nullptr);
 
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     model.clear();
 
@@ -1378,20 +1379,20 @@ void tst_QQuickListView::moved(const QUrl &source, QQuickItemView::VerticalLayou
     QTRY_VERIFY(contentItem != nullptr);
 
     // always need to wait for view to be painted before the first move()
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     bool waitForPolish = (contentY != 0);
     if (verticalLayoutDirection == QQuickItemView::BottomToTop) {
         listview->setVerticalLayoutDirection(verticalLayoutDirection);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
         contentY = -listview->height() - contentY;
     }
     listview->setContentY(contentY);
     if (waitForPolish)
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     model.moveItems(from, to, count);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "wrapper");
     int firstVisibleIndex = -1;
@@ -1604,7 +1605,7 @@ void tst_QQuickListView::multipleChanges(bool condensed)
 
     QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
     QTRY_VERIFY(listview != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i=0; i<changes.count(); i++) {
         switch (changes[i].type) {
@@ -1632,10 +1633,10 @@ void tst_QQuickListView::multipleChanges(bool condensed)
                 continue;
         }
         if (!condensed) {
-            QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+            QVERIFY(QQuickTest::qWaitForItemPolished(listview));
         }
     }
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QCOMPARE(listview->count(), newCount);
     QCOMPARE(listview->count(), model.count());
@@ -1852,7 +1853,7 @@ void tst_QQuickListView::swapWithFirstItem()
 
     QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
     QTRY_VERIFY(listview != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // ensure content position is stable
     listview->setContentY(0);
@@ -1915,7 +1916,7 @@ void tst_QQuickListView::enforceRange()
     QTRY_COMPARE(listview->preferredHighlightBegin(), 100.0);
     QTRY_COMPARE(listview->preferredHighlightEnd(), 100.0);
     QTRY_COMPARE(listview->highlightRangeMode(), QQuickListView::StrictlyEnforceRange);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -1970,7 +1971,7 @@ void tst_QQuickListView::enforceRange_withoutHighlight()
 
     QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
     QTRY_VERIFY(listview != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     qreal expectedPos = -100.0;
 
@@ -2014,7 +2015,7 @@ void tst_QQuickListView::spacing()
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -2073,7 +2074,7 @@ void tst_QQuickListView::sections(const QUrl &source)
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -2143,9 +2144,9 @@ void tst_QQuickListView::sections(const QUrl &source)
 
     // check that headers change when item changes
     listview->setContentY(0);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     model.modifyItem(0, "changed", "2");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     item = findItem<QQuickItem>(contentItem, "wrapper", 1);
     QTRY_VERIFY(item);
@@ -2173,7 +2174,7 @@ void tst_QQuickListView::sectionsDelegate()
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -2197,7 +2198,7 @@ void tst_QQuickListView::sectionsDelegate()
     model.modifyItem(2, "Three", "aaa");
     model.modifyItem(3, "Four", "aaa");
     model.modifyItem(4, "Five", "aaa");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 0; i < 3; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem,
@@ -2233,7 +2234,7 @@ void tst_QQuickListView::sectionsDelegate()
     model.modifyItem(9, "Two", "aaa");
     model.modifyItem(10, "Two", "aaa");
     model.modifyItem(11, "Two", "aaa");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(findItems<QQuickItem>(contentItem, "sect_aaa").count(), 1);
     window->rootObject()->setProperty("sectionProperty", "name");
     // ensure view has settled.
@@ -2283,7 +2284,7 @@ void tst_QQuickListView::sectionsDragOutsideBounds()
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // QTBUG-17769
     // Drag view up beyond bounds
@@ -2329,11 +2330,11 @@ void tst_QQuickListView::sectionsDelegate_headerVisibility()
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // ensure section header is maintained in view
     listview->setCurrentIndex(20);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_VERIFY(qFuzzyCompare(listview->contentY(), 200.0));
     QTRY_VERIFY(!listview->isMoving());
     listview->setCurrentIndex(0);
@@ -2360,7 +2361,7 @@ void tst_QQuickListView::sectionsPositioning()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 0; i < 3; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
@@ -2378,12 +2379,12 @@ void tst_QQuickListView::sectionsPositioning()
 
     // move down a little and check that section header is at top
     listview->setContentY(10);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QCOMPARE(topItem->y(), 0.);
 
     // push the top header up
     listview->setContentY(110);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     topItem = findVisibleChild(contentItem, "sect_0"); // section header
     QVERIFY(topItem);
     QCOMPARE(topItem->y(), 100.);
@@ -2398,13 +2399,13 @@ void tst_QQuickListView::sectionsPositioning()
 
     // Move past section 0
     listview->setContentY(120);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     topItem = findVisibleChild(contentItem, "sect_0"); // section header
     QVERIFY(!topItem);
 
     // Push section footer down
     listview->setContentY(70);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     bottomItem = findVisibleChild(contentItem, "sect_4"); // section footer
     QVERIFY(bottomItem);
     QCOMPARE(bottomItem->y(), 380.);
@@ -2416,7 +2417,7 @@ void tst_QQuickListView::sectionsPositioning()
     model.modifyItem(2, "Three", "aAa");
     model.modifyItem(3, "Four", "aaA");
     model.modifyItem(4, "Five", "Aaa");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QTRY_COMPARE(listview->currentSection(), QString("aaa"));
 
@@ -2432,7 +2433,7 @@ void tst_QQuickListView::sectionsPositioning()
 
     // remove section boundary
     listview->setContentY(120);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     model.removeItem(5);
     listview->forceLayout();
     QTRY_COMPARE(listview->count(), model.count());
@@ -2449,27 +2450,27 @@ void tst_QQuickListView::sectionsPositioning()
 
     // Change the next section
     listview->setContentY(0);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     bottomItem = findVisibleChild(contentItem, "sect_3"); // section footer
     QVERIFY(bottomItem);
     QTRY_COMPARE(bottomItem->y(), 300.);
 
     model.modifyItem(14, "New", "new");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QTRY_VERIFY(bottomItem = findVisibleChild(contentItem, "sect_new")); // section footer
     QTRY_COMPARE(bottomItem->y(), 300.);
 
     // delegate size increase should push section footer down
     listview->setContentY(70);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_VERIFY(bottomItem = findVisibleChild(contentItem, "sect_3")); // section footer
     QTRY_COMPARE(bottomItem->y(), 370.);
     QQuickItem *inlineSection = findVisibleChild(contentItem, "sect_new");
     item = findItem<QQuickItem>(contentItem, "wrapper", 13);
     QVERIFY(item);
     item->setHeight(40.);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(bottomItem->y(), 380.);
     QCOMPARE(inlineSection->y(), 360.);
     item->setHeight(20.);
@@ -2477,14 +2478,14 @@ void tst_QQuickListView::sectionsPositioning()
     // Turn sticky footer off
     listview->setContentY(20);
     window->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels | QQuickViewSection::CurrentLabelAtStart)));
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_VERIFY(item = findVisibleChild(contentItem, "sect_new")); // inline label restored
     QCOMPARE(item->y(), 340.);
 
     // Turn sticky header off
     listview->setContentY(30);
     window->rootObject()->setProperty("sectionPositioning", QVariant(int(QQuickViewSection::InlineLabels)));
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_VERIFY(item = findVisibleChild(contentItem, "sect_aaa")); // inline label restored
     QCOMPARE(item->y(), 0.);
 
@@ -2520,7 +2521,7 @@ void tst_QQuickListView::sectionPropertyChange()
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     for (int i = 0; i < 2; ++i) {
@@ -2530,7 +2531,7 @@ void tst_QQuickListView::sectionPropertyChange()
     }
 
     QMetaObject::invokeMethod(window->rootObject(), "switchGroups");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     for (int i = 0; i < 2; ++i) {
@@ -2540,7 +2541,7 @@ void tst_QQuickListView::sectionPropertyChange()
     }
 
     QMetaObject::invokeMethod(window->rootObject(), "switchGroups");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     for (int i = 0; i < 2; ++i) {
@@ -2550,7 +2551,7 @@ void tst_QQuickListView::sectionPropertyChange()
     }
 
     QMetaObject::invokeMethod(window->rootObject(), "switchGrouped");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     for (int i = 0; i < 2; ++i) {
@@ -2560,7 +2561,7 @@ void tst_QQuickListView::sectionPropertyChange()
     }
 
     QMetaObject::invokeMethod(window->rootObject(), "switchGrouped");
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     for (int i = 0; i < 2; ++i) {
@@ -2628,7 +2629,7 @@ void tst_QQuickListView::sectionsItemInsertion()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 0; i < 3; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
@@ -2644,7 +2645,7 @@ void tst_QQuickListView::sectionsItemInsertion()
     for (int i = 0; i < 10; i++)
         model.insertItem(i, "Item" + QString::number(i), QLatin1String("A"));
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     QVERIFY(itemCount > 10);
@@ -2782,7 +2783,7 @@ void tst_QQuickListView::currentIndex()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // currentIndex is initialized to 20
     // currentItem should be in view
@@ -2885,7 +2886,7 @@ void tst_QQuickListView::noCurrentIndex()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // current index should be -1 at startup
     // and we should not have a currentItem or highlightItem
@@ -2930,7 +2931,7 @@ void tst_QQuickListView::keyNavigation()
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
@@ -3245,7 +3246,7 @@ void tst_QQuickListView::positionViewAtBeginningEnd()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     listview->setContentY(100);
 
@@ -3305,10 +3306,10 @@ void tst_QQuickListView::positionViewAtIndex()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     window->rootObject()->setProperty("enforceRange", enforceRange);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     listview->setContentY(initContentY);
 
@@ -3385,7 +3386,7 @@ void tst_QQuickListView::resetModel()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QTRY_COMPARE(listview->count(), model.rowCount());
 
@@ -3656,7 +3657,7 @@ void tst_QQuickListView::QTBUG_11105()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -3748,7 +3749,7 @@ void tst_QQuickListView::header()
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -3827,7 +3828,7 @@ void tst_QQuickListView::header()
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     listview->setWidth(240);
     listview->setHeight(320);
@@ -3934,7 +3935,7 @@ void tst_QQuickListView::headerChangesViewport()
 
     QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
     QTRY_VERIFY(listview != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -3984,7 +3985,7 @@ void tst_QQuickListView::footer()
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -4173,7 +4174,7 @@ void tst_QQuickListView::extents()
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -4313,7 +4314,7 @@ void tst_QQuickListView::resizeView()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -4329,7 +4330,7 @@ void tst_QQuickListView::resizeView()
     QCOMPARE(heightRatio.toReal(), 0.4);
 
     listview->setHeight(200);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QMetaObject::invokeMethod(window->rootObject(), "heightRatio", Q_RETURN_ARG(QVariant, heightRatio));
     QCOMPARE(heightRatio.toReal(), 0.25);
@@ -4390,7 +4391,7 @@ void tst_QQuickListView::resizeViewAndRepaint()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // item at index 10 should not be currently visible
     QVERIFY(!findItem<QQuickItem>(contentItem, "wrapper", 10));
@@ -4425,7 +4426,7 @@ void tst_QQuickListView::sizeLessThan1()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Confirm items positioned correctly
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
@@ -4477,13 +4478,13 @@ void tst_QQuickListView::resizeDelegate()
     QVERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QCOMPARE(listview->count(), model.rowCount());
 
     listview->setCurrentIndex(25);
     listview->setContentY(0);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 0; i < 16; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
@@ -4495,7 +4496,7 @@ void tst_QQuickListView::resizeDelegate()
     QTRY_COMPARE(listview->highlightItem()->y(), 500.0);
 
     window->rootObject()->setProperty("delegateHeight", 30);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 0; i < 11; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
@@ -4509,7 +4510,7 @@ void tst_QQuickListView::resizeDelegate()
     listview->setCurrentIndex(1);
     listview->positionViewAtIndex(25, QQuickListView::Beginning);
     listview->positionViewAtIndex(5, QQuickListView::Beginning);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 5; i < 16; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
@@ -4521,7 +4522,7 @@ void tst_QQuickListView::resizeDelegate()
     QTRY_COMPARE(listview->highlightItem()->y(), 30.0);
 
     window->rootObject()->setProperty("delegateHeight", 20);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     for (int i = 5; i < 11; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
@@ -4558,7 +4559,7 @@ void tst_QQuickListView::resizeFirstDelegate()
     QVERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *item = nullptr;
     for (int i = 0; i < model.count(); ++i) {
@@ -4597,7 +4598,7 @@ void tst_QQuickListView::resizeFirstDelegate()
 
     listview->setCurrentIndex(19);
     qApp->processEvents();
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // items 0-2 should have been deleted
     for (int i=0; i<3; i++) {
@@ -4628,7 +4629,7 @@ void tst_QQuickListView::repositionResizedDelegate()
 
     QQuickListView *listview = qobject_cast<QQuickListView*>(window->rootObject());
     QTRY_VERIFY(listview != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *positioner = findItem<QQuickItem>(window->rootObject(), "positioner");
     QVERIFY(positioner);
@@ -4643,7 +4644,7 @@ void tst_QQuickListView::repositionResizedDelegate()
 
     listview->setContentX(contentPos_itemFirstHalfVisible.x());
     listview->setContentY(contentPos_itemFirstHalfVisible.y());
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     prevSpyCount = spy.count();
     QVERIFY(QMetaObject::invokeMethod(window->rootObject(), "incrementRepeater"));
     QTRY_COMPARE(positioner->boundingRect().size(), resizedPositionerRect.size());
@@ -4660,7 +4661,7 @@ void tst_QQuickListView::repositionResizedDelegate()
 
     listview->setContentX(contentPos_itemSecondHalfVisible.x());
     listview->setContentY(contentPos_itemSecondHalfVisible.y());
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     prevSpyCount = spy.count();
 
     QVERIFY(QMetaObject::invokeMethod(window->rootObject(), "incrementRepeater"));
@@ -4768,7 +4769,7 @@ void tst_QQuickListView::indexAt_itemAt()
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *item = nullptr;
     if (index >= 0) {
@@ -4926,7 +4927,7 @@ void tst_QQuickListView::rightToLeft()
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != nullptr);
@@ -5039,7 +5040,7 @@ void tst_QQuickListView::margins()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QCOMPARE(listview->contentY(), -30.);
     QCOMPARE(listview->originY(), 0.);
@@ -5048,7 +5049,7 @@ void tst_QQuickListView::margins()
     listview->positionViewAtEnd();
     qreal pos = listview->contentY();
     listview->setContentY(pos + 80);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     listview->returnToBounds();
     QTRY_COMPARE(listview->contentY(), pos + 50);
 
@@ -5059,7 +5060,7 @@ void tst_QQuickListView::margins()
     listview->forceLayout();
     QTRY_COMPARE(listview->count(), model.count());
     listview->setContentY(-50);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     listview->returnToBounds();
     QCOMPARE(listview->originY(), 20.);
     QTRY_COMPARE(listview->contentY(), -10.);
@@ -5112,7 +5113,7 @@ void tst_QQuickListView::marginsResize()
     listview->setOrientation(orientation);
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // view is resized after componentCompleted - top margin should still be visible
     if (orientation == QQuickListView::Vertical)
@@ -5252,7 +5253,7 @@ void tst_QQuickListView::snapToItem()
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
     listview->setHighlightRangeMode(QQuickItemView::HighlightRangeMode(highlightRangeMode));
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -5304,7 +5305,7 @@ void tst_QQuickListView::snapToItemWithSpacing_QTBUG_59852()
     auto *listView = qobject_cast<QQuickListView*>(window->rootObject());
     QVERIFY(listView);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listView)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listView));
 
     // each item in the list is 100 pixels tall, and the spacing is 100
 
@@ -5335,14 +5336,14 @@ void tst_QQuickListView::snapOneItemResize_QTBUG_43555()
 
     QSignalSpy currentIndexSpy(listview, SIGNAL(currentIndexChanged()));
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(listview->currentIndex(), 5);
     currentIndexSpy.clear();
 
     window->resize(QSize(400, 320));
 
     QTRY_COMPARE(int(listview->width()), 400);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QTRY_COMPARE(listview->currentIndex(), 5);
     QCOMPARE(currentIndexSpy.count(), 0);
@@ -5652,7 +5653,7 @@ void tst_QQuickListView::snapOneItem()
     listview->setLayoutDirection(layoutDirection);
     listview->setVerticalLayoutDirection(verticalLayoutDirection);
     listview->setHighlightRangeMode(QQuickItemView::HighlightRangeMode(highlightRangeMode));
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
@@ -5721,14 +5722,14 @@ void tst_QQuickListView::snapOneItemCurrentIndexRemoveAnimation()
     QQuickListView *listview = qobject_cast<QQuickListView*>(window->rootObject());
     QTRY_VERIFY(listview != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(listview->currentIndex(), 0);
     QSignalSpy currentIndexSpy(listview, SIGNAL(currentIndexChanged()));
 
     QMetaObject::invokeMethod(window->rootObject(), "removeItemZero");
     QTRY_COMPARE(listview->property("transitionsRun").toInt(), 1);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QCOMPARE(listview->currentIndex(), 0);
     QCOMPARE(currentIndexSpy.count(), 0);
@@ -5744,7 +5745,7 @@ void tst_QQuickListView::snapOneItemWrongDirection()
     QQuickListView *listview = qobject_cast<QQuickListView*>(window->rootObject());
     QTRY_VERIFY(listview != nullptr);
 
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     QTRY_COMPARE(listview->currentIndex(), 0);
 
     listview->flick(0,500);
@@ -5894,7 +5895,7 @@ void tst_QQuickListView::unrequestedVisibility()
     QCOMPARE(delegateVisible(item), false);
 
     model.moveItems(19, 1, 1);
-    QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(leftview));
 
     QTRY_VERIFY((item = findItem<QQuickItem>(leftContent, wrapperObjectName, 1)));
     QCOMPARE(delegateVisible(item), false);
@@ -5923,7 +5924,7 @@ void tst_QQuickListView::unrequestedVisibility()
     QCOMPARE(delegateVisible(item), false);
 
     model.moveItems(3, 4, 1);
-    QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(leftview));
 
     item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4);
     QVERIFY(item);
@@ -5939,7 +5940,7 @@ void tst_QQuickListView::unrequestedVisibility()
     QCOMPARE(delegateVisible(item), false);
 
     model.moveItems(4, 3, 1);
-    QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(leftview));
 
     item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4);
     QVERIFY(item);
@@ -5955,7 +5956,7 @@ void tst_QQuickListView::unrequestedVisibility()
     QCOMPARE(delegateVisible(item), false);
 
     model.moveItems(16, 17, 1);
-    QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(leftview));
 
     item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4);
     QVERIFY(item);
@@ -5971,7 +5972,7 @@ void tst_QQuickListView::unrequestedVisibility()
     QCOMPARE(delegateVisible(item), false);
 
     model.moveItems(17, 16, 1);
-    QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(leftview));
 
     item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4);
     QVERIFY(item);
@@ -6031,7 +6032,7 @@ void tst_QQuickListView::populateTransitions()
         QTRY_COMPARE(listview->property("countPopulateTransitions").toInt(), 0);
         QTRY_COMPARE(listview->property("countAddTransitions").toInt(), 16);
     } else {
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
         QCOMPARE(listview->property("countPopulateTransitions").toInt(), 0);
         QCOMPARE(listview->property("countAddTransitions").toInt(), 0);
     }
@@ -6142,7 +6143,7 @@ void tst_QQuickListView::sizeTransitions()
 
     QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
     QTRY_VERIFY(listview != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // the following will start the transition
     model.addItem(QLatin1String("Test"), "");
@@ -6207,11 +6208,11 @@ void tst_QQuickListView::addTransitions()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     if (contentY != 0) {
         listview->setContentY(contentY);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     }
 
     QList<QPair<QString,QString> > expectedDisplacedValues = expectedDisplacedIndexes.getModelDataValues(model);
@@ -6407,7 +6408,7 @@ void tst_QQuickListView::moveTransitions()
 
     if (contentY != 0) {
         listview->setContentY(contentY);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     }
 
     QList<QPair<QString,QString> > expectedDisplacedValues = expectedDisplacedIndexes.getModelDataValues(model);
@@ -6606,11 +6607,11 @@ void tst_QQuickListView::removeTransitions()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     if (contentY != 0) {
         listview->setContentY(contentY);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     }
 
     QList<QPair<QString,QString> > expectedDisplacedValues = expectedDisplacedIndexes.getModelDataValues(model);
@@ -6818,7 +6819,7 @@ void tst_QQuickListView::displacedTransitions()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QList<QPair<QString,QString> > expectedDisplacedValues = expectedDisplacedIndexes.getModelDataValues(model);
     listview->setProperty("displaceTransitionsDone", false);
@@ -6839,7 +6840,7 @@ void tst_QQuickListView::displacedTransitions()
             break;
         case ListChange::Moved:
             model.moveItems(change.index, change.to, change.count);
-            QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+            QVERIFY(QQuickTest::qWaitForItemPolished(listview));
             break;
         case ListChange::SetCurrent:
         case ListChange::SetContentY:
@@ -7038,11 +7039,11 @@ void tst_QQuickListView::multipleTransitions()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     if (contentY != 0) {
         listview->setContentY(contentY);
-        QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+        QVERIFY(QQuickTest::qWaitForItemPolished(listview));
     }
 
     int timeBetweenActions = window->rootObject()->property("timeBetweenActions").toInt();
@@ -7076,7 +7077,7 @@ void tst_QQuickListView::multipleTransitions()
                 break;
             case ListChange::Moved:
                 model.moveItems(changes[i].index, changes[i].to, changes[i].count);
-                QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+                QVERIFY(QQuickTest::qWaitForItemPolished(listview));
                 if (i == changes.count() - 1) {
                     QTRY_VERIFY(!listview->property("runningMoveTargets").toBool());
                     QTRY_VERIFY(!listview->property("runningMoveDisplaced").toBool());
@@ -7089,7 +7090,7 @@ void tst_QQuickListView::multipleTransitions()
                 break;
             case ListChange::SetContentY:
                 listview->setContentY(changes[i].pos);
-                QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+                QVERIFY(QQuickTest::qWaitForItemPolished(listview));
                 break;
             case ListChange::Polish:
                 break;
@@ -7195,7 +7196,7 @@ void tst_QQuickListView::multipleDisplaced()
     QTRY_VERIFY(listview != nullptr);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     model.moveItems(12, 8, 1);
     QTest::qWait(window->rootObject()->property("duration").toInt() / 2);
@@ -7289,7 +7290,7 @@ void tst_QQuickListView::flickBeyondBounds()
 
     QQuickItem *contentItem = listview->contentItem();
     QTRY_VERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     // Flick view up beyond bounds
     flick(window.data(), QPoint(10, 10), QPoint(10, -2000), 180);
@@ -7401,7 +7402,7 @@ void tst_QQuickListView::destroyItemOnCreation()
 
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QCOMPARE(window->rootObject()->property("createdIndex").toInt(), -1);
     model.addItem("new item", "");
@@ -7425,7 +7426,7 @@ void tst_QQuickListView::parentBinding()
 
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != nullptr);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item);
@@ -8829,7 +8830,7 @@ void tst_QQuickListView::QTBUG_34576_velocityZero()
     QVERIFY(listview);
     QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem);
-    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QVERIFY(QQuickTest::qWaitForItemPolished(listview));
 
     QSignalSpy horizontalVelocitySpy(listview, SIGNAL(horizontalVelocityChanged()));