Menu: support dynamically added items in the same way as static ones

Task-number: QTBUG-53274
Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

src/quicktemplates2/qquickmenu.cpp

@@ -112,6 +112,14 @@ void QQuickMenuPrivate::insertItem(int index, QQuickItem *item)
         resizeItem(item);
     QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent);
     contentModel->insert(index, item);
+
+    QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem *>(item);
+    if (menuItem) {
+        Q_Q(QQuickMenu);
+        QObjectPrivate::connect(menuItem, &QQuickMenuItem::pressed, this, &QQuickMenuPrivate::onItemPressed);
+        QObject::connect(menuItem, &QQuickMenuItem::triggered, q, &QQuickPopup::close);
+        QObjectPrivate::connect(menuItem, &QQuickItem::activeFocusChanged, this, &QQuickMenuPrivate::onItemActiveFocusChanged);
+    }
 }
 
 void QQuickMenuPrivate::moveItem(int from, int to)
@@ -126,6 +134,14 @@ void QQuickMenuPrivate::removeItem(int index, QQuickItem *item)
     QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent);
     item->setParentItem(nullptr);
     contentModel->remove(index);
+
+    QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem *>(item);
+    if (menuItem) {
+        Q_Q(QQuickMenu);
+        QObjectPrivate::disconnect(menuItem, &QQuickMenuItem::pressed, this, &QQuickMenuPrivate::onItemPressed);
+        QObject::disconnect(menuItem, &QQuickMenuItem::triggered, q, &QQuickPopup::close);
+        QObjectPrivate::disconnect(menuItem, &QQuickItem::activeFocusChanged, this, &QQuickMenuPrivate::onItemActiveFocusChanged);
+    }
 }
 
 void QQuickMenuPrivate::resizeItem(QQuickItem *item)
@@ -231,13 +247,6 @@ void QQuickMenuPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObj
             item->setParentItem(p->contentItem);
         } else if (p->contentModel->indexOf(item, nullptr) == -1) {
             q->addItem(item);
-
-            QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem *>(item);
-            if (menuItem) {
-                QObjectPrivate::connect(menuItem, &QQuickMenuItem::pressed, p, &QQuickMenuPrivate::onItemPressed);
-                QObject::connect(menuItem, &QQuickMenuItem::triggered, q, &QQuickPopup::close);
-                QObjectPrivate::connect(menuItem, &QQuickItem::activeFocusChanged, p, &QQuickMenuPrivate::onItemActiveFocusChanged);
-            }
         }
     } else {
         p->contentData.append(obj);

tests/auto/menu/data/addItem.qml

@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+
+ApplicationWindow {
+    width: 200
+    height: 200
+
+    property alias menu: menu
+
+    MenuItem {
+        id: newMenuItem
+        text: qsTr("New")
+    }
+
+    Menu {
+        id: menu
+        y: parent.height
+
+        Component.onCompleted: addItem(newMenuItem)
+    }
+}

tests/auto/menu/tst_menu.cpp

@@ -64,6 +64,7 @@ private slots:
     void mouse();
     void contextMenuKeyboard();
     void menuButton();
+    void addItem();
 };
 
 void tst_menu::defaults()
@@ -250,6 +251,23 @@ void tst_menu::menuButton()
     QVERIFY(firstItem->hasActiveFocus());
 }
 
+void tst_menu::addItem()
+{
+    QQuickApplicationHelper helper(this, QLatin1String("addItem.qml"));
+    QQuickApplicationWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
+    QVERIFY(menu);
+    menu->open();
+
+    QQuickItem *menuItem = menu->itemAt(0);
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
+        menuItem->mapToScene(QPointF(menuItem->width() / 2, menuItem->height() / 2)).toPoint());
+    QVERIFY(!menu->isVisible());
+}
+
 QTEST_MAIN(tst_menu)
 
 #include "tst_menu.moc"