From e0b356af9e747171dbdfc0d2935336ef14b4839d Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 8 May 2020 13:41:53 +0200 Subject: Menu: remove deprecated removeItem(var) overload [ChangeLog][Controls][Menu] The deprecated removeItem(var) function was removed. removeItem(Item) or takeItem(int) can be used instead. Change-Id: I79757c22b4f81e1b380798623bd1f15eb09c1647 Reviewed-by: Fabian Kosmale --- tests/auto/controls/data/tst_menuitem.qml | 4 ++-- tests/auto/qquickmenu/data/removeTakeItem.qml | 4 ---- tests/auto/qquickmenu/tst_qquickmenu.cpp | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml index 27c23ae5..ef074d1d 100644 --- a/tests/auto/controls/data/tst_menuitem.qml +++ b/tests/auto/controls/data/tst_menuitem.qml @@ -182,11 +182,11 @@ TestCase { compare(item1.menu, control) compare(item2.menu, control) - control.removeItem(1) + control.removeItem(control.itemAt(1)) compare(item1.menu, control) compare(item2.menu, null) - control.removeItem(0) + control.removeItem(control.itemAt(0)) compare(item1.menu, null) compare(item2.menu, null) } diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml index 8352bffd..7e930812 100644 --- a/tests/auto/qquickmenu/data/removeTakeItem.qml +++ b/tests/auto/qquickmenu/data/removeTakeItem.qml @@ -72,10 +72,6 @@ ApplicationWindow { menu.removeItem(null) } - function removeFirstIndex() { - menu.removeItem(0) - } - Menu { id: menu MenuItem { diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 22aece0c..54a5d9f4 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -1013,12 +1013,6 @@ void tst_QQuickMenu::removeTakeItem() QCOMPARE(menuItem3->menu(), menu); QCoreApplication::sendPostedEvents(menuItem3, QEvent::DeferredDelete); QVERIFY(!menuItem3.isNull()); - - // deprecated removeItem(int) does not destroy - QVERIFY(QMetaObject::invokeMethod(window, "removeFirstIndex")); - QVERIFY(!menuItem3->menu()); - QCoreApplication::sendPostedEvents(menuItem3, QEvent::DeferredDelete); - QVERIFY(!menuItem3.isNull()); } void tst_QQuickMenu::subMenuMouse_data() -- cgit v1.2.3