3 files changed, 5 insertions, 6 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 3d0f550d14..e6ab69e093 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2776,7 +2776,7 @@ void QQuickItemPrivate::refWindow(QQuickWindow *c)
     window = c;
 
     if (polishScheduled)
-        QQuickWindowPrivate::get(window)->itemsToPolish.insert(q);
+        QQuickWindowPrivate::get(window)->itemsToPolish.append(q);
 
     if (!parentItem)
         QQuickWindowPrivate::get(window)->parentlessItems.insert(q);
@@ -2808,7 +2808,7 @@ void QQuickItemPrivate::derefWindow()
     removeFromDirtyList();
     QQuickWindowPrivate *c = QQuickWindowPrivate::get(window);
     if (polishScheduled)
-        c->itemsToPolish.remove(q);
+        c->itemsToPolish.removeOne(q);
     QMutableHashIterator<int, QQuickItem *> itemTouchMapIt(c->itemForTouchPointId);
     while (itemTouchMapIt.hasNext()) {
         if (itemTouchMapIt.next().value() == q)
@@ -4102,7 +4102,7 @@ void QQuickItem::polish()
         if (d->window) {
             QQuickWindowPrivate *p = QQuickWindowPrivate::get(d->window);
             bool maybeupdate = p->itemsToPolish.isEmpty();
-            p->itemsToPolish.insert(this);
+            p->itemsToPolish.append(this);
             if (maybeupdate) d->window->maybeUpdate();
         }
     }
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index ee2556af64..d7304cea7e 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -259,8 +259,7 @@ void QQuickWindowPrivate::polishItems()
     // the user.
     int recursionSafeguard = INT_MAX;
     while (!itemsToPolish.isEmpty() && --recursionSafeguard > 0) {
-        QQuickItem *item = *itemsToPolish.begin();
-        itemsToPolish.remove(item);
+        QQuickItem *item = itemsToPolish.takeLast();
         QQuickItemPrivate::get(item)->polishScheduled = false;
         item->updatePolish();
     }
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 605a36fb1d..0d33d2398a 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -200,7 +200,7 @@ public:
     QQuickItem *dirtyItemList;
     QList<QSGNode *> cleanupNodeList;
 
-    QSet<QQuickItem *> itemsToPolish;
+    QVector<QQuickItem *> itemsToPolish;
 
     void updateDirtyNodes();
     void cleanupNodes();