Add QQuickMenu::add/insert/remove/takeMenu()

[ChangeLog][Controls][Menu] Added addMenu(), insertMenu(),
removeMenu(), and takeMenu() methods for adding and removing
sub-menus programmatically.

Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 53 insertions, 0 deletions

diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp
index 836b0ef1..ce0628fb 100644
--- a/tests/auto/menu/tst_menu.cpp
+++ b/tests/auto/menu/tst_menu.cpp
@@ -79,6 +79,7 @@ private slots:
     void subMenuKeyboard();
     void subMenuPosition_data();
     void subMenuPosition();
+    void addRemoveSubMenus();
 };
 
 void tst_menu::defaults()
@@ -919,6 +920,58 @@ void tst_menu::subMenuPosition()
     }
 }
 
+void tst_menu::addRemoveSubMenus()
+{
+    QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml"));
+    QQuickWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
+    QVERIFY(mainMenu);
+
+    QPointer<QQuickMenu> subMenu1 = window->property("subMenu1").value<QQuickMenu *>();
+    QVERIFY(!subMenu1.isNull());
+
+    QPointer<QQuickMenu> subMenu2 = window->property("subMenu2").value<QQuickMenu *>();
+    QVERIFY(!subMenu2.isNull());
+
+    QPointer<QQuickMenu> subSubMenu1 = window->property("subSubMenu1").value<QQuickMenu *>();
+    QVERIFY(!subSubMenu1.isNull());
+
+    // takeMenu(int) does not destroy the menu, but does destroy the respective item in the parent menu
+    QPointer<QQuickMenuItem> subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
+    QVERIFY(subSubMenu1Item);
+    QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1.data());
+    QCOMPARE(subMenu1->takeMenu(2), subSubMenu1.data());
+    QVERIFY(!subMenu1->itemAt(2));
+    QCoreApplication::sendPostedEvents(subSubMenu1, QEvent::DeferredDelete);
+    QVERIFY(!subSubMenu1.isNull());
+    QCoreApplication::sendPostedEvents(subSubMenu1Item, QEvent::DeferredDelete);
+    QVERIFY(subSubMenu1Item.isNull());
+
+    // takeMenu(int) does not destroy an item that doesn't present a menu
+    QPointer<QQuickMenuItem> subMenuItem1 = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(0));
+    QVERIFY(subMenuItem1);
+    QVERIFY(!subMenuItem1->subMenu());
+    QVERIFY(!subMenu1->takeMenu(0));
+    QCoreApplication::sendPostedEvents(subMenuItem1, QEvent::DeferredDelete);
+    QVERIFY(!subMenuItem1.isNull());
+
+    // addMenu(Menu) re-creates the respective item in the parent menu
+    subMenu1->addMenu(subSubMenu1);
+    subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
+    QVERIFY(!subSubMenu1Item.isNull());
+
+    // removeMenu(Menu) destroys both the menu and the respective item in the parent menu
+    subMenu1->removeMenu(subSubMenu1);
+    QVERIFY(!subMenu1->itemAt(2));
+    QCoreApplication::sendPostedEvents(subSubMenu1, QEvent::DeferredDelete);
+    QVERIFY(subSubMenu1.isNull());
+    QCoreApplication::sendPostedEvents(subSubMenu1Item, QEvent::DeferredDelete);
+    QVERIFY(subSubMenu1Item.isNull());
+}
+
 QTEST_MAIN(tst_menu)
 
 #include "tst_menu.moc"