Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3

 Conflicts:
	src/quicktemplates2/qquickmenubar.cpp
	src/quicktemplates2/qquickmenubar_p.h
	src/quicktemplates2/qquickmenubar_p_p.h

Change-Id: I5c2115f05826f68f1b1f5ce6762273cd91e6997e

1 files changed, 38 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp
index 6016e70d..62205b6e 100644
--- a/src/quicktemplates2/qquickmenubar.cpp
+++ b/src/quicktemplates2/qquickmenubar.cpp
@@ -76,6 +76,25 @@ QT_BEGIN_NAMESPACE
         {Focus Management in Qt Quick Controls 2}
 */
 
+void QQuickMenuBarPrivate::createItems()
+{
+    // removeItem() will remove stuff from contentData, so we have to make a copy of it.
+    const auto originalContentData = QQuickContainerPrivate::contentData;
+    // Sanity check that there aren't any items we don't know about.
+    Q_ASSERT(contentModel->count() == 0);
+
+    for (QObject *object : originalContentData) {
+        if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(object)) {
+            // It's a QQuickMenu; create a QQuickMenuBarItem for it.
+            QQuickItem *menuItem = createItem(menu);
+            addObject(menuItem);
+        } else if (qobject_cast<QQuickMenuBarItem *>(object)) {
+            addObject(object);
+        }
+        // If it's neither, skip it because we don't care about it.
+    }
+}
+
 QQuickItem *QQuickMenuBarPrivate::beginCreateItem()
 {
     Q_Q(QQuickMenuBar);
@@ -254,9 +273,18 @@ void QQuickMenuBarPrivate::itemImplicitHeightChanged(QQuickItem *item)
 void QQuickMenuBarPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObject *obj)
 {
     QQuickMenuBar *menuBar = static_cast<QQuickMenuBar *>(prop->object);
-    if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(obj))
-        obj = QQuickMenuBarPrivate::get(menuBar)->createItem(menu);
-    QQuickContainerPrivate::contentData_append(prop, obj);
+    QQuickMenuBarPrivate *menuBarPrivate = QQuickMenuBarPrivate::get(menuBar);
+    if (!menuBarPrivate->componentComplete) {
+        // Don't add items until we're complete, as the delegate could change in the meantime.
+        // We'll add it to contentData and create it when we're complete.
+        menuBarPrivate->QQuickContainerPrivate::contentData.append(obj);
+        return;
+    }
+
+    if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(obj)) {
+        QQuickItem *menuItem = menuBarPrivate->createItem(menu);
+        menuBarPrivate->addObject(menuItem);
+    }
 }
 
 void QQuickMenuBarPrivate::menus_append(QQmlListProperty<QQuickMenu> *prop, QQuickMenu *obj)
@@ -454,6 +482,13 @@ QQmlListProperty<QObject> QQuickMenuBarPrivate::contentData()
                                      QQuickContainerPrivate::contentData_clear);
 }
 
+void QQuickMenuBar::componentComplete()
+{
+    Q_D(QQuickMenuBar);
+    QQuickContainer::componentComplete();
+    d->createItems();
+}
+
 bool QQuickMenuBar::eventFilter(QObject *object, QEvent *event)
 {
     return QObject::eventFilter(object, event);