Fix QQuickMenuPrivate::itemSiblingOrderChanged()

QQuickContainer was fixed in the previous commit. Apply the same fix to
QQuickMenu, because the code is based on QQuickContainer. I'm not able
to make QQuickMenu crash with the same test case adapted to QQuickMenu,
though. QQuickMenu already has tests for Repeater in tst_menu.cpp.

Task-number: QTBUG-61310
Change-Id: I3fba1b7ef15659724880df080dab5015eae484a3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index e6f22e2b..9e8fabe0 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -197,10 +197,14 @@ void QQuickMenuPrivate::itemSiblingOrderChanged(QQuickItem *)
     // reorder the restacked items (eg. by a Repeater)
     Q_Q(QQuickMenu);
     QList<QQuickItem *> siblings = contentItem->childItems();
+
+    int to = 0;
     for (int i = 0; i < siblings.count(); ++i) {
         QQuickItem* sibling = siblings.at(i);
+        if (QQuickItemPrivate::get(sibling)->isTransparentForPositioner())
+            continue;
         int index = contentModel->indexOf(sibling, nullptr);
-        q->moveItem(index, i);
+        q->moveItem(index, to++);
     }
 }