aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/quicktemplates2/qquickmenu.cpp17
-rw-r--r--src/quicktemplates2/qquickmenu_p.h3
-rw-r--r--tests/auto/controls/data/tst_menuitem.qml4
-rw-r--r--tests/auto/qquickmenu/data/removeTakeItem.qml4
-rw-r--r--tests/auto/qquickmenu/tst_qquickmenu.cpp6
5 files changed, 3 insertions, 31 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index d4007870..a19f8c75 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -795,23 +795,6 @@ void QQuickMenu::moveItem(int from, int to)
}
/*!
- \deprecated
- \qmlmethod void QtQuick.Controls::Menu::removeItem(int index)
-
- Use Menu::removeItem(Item) or Menu::takeItem(int) instead.
-*/
-void QQuickMenu::removeItem(const QVariant &var)
-{
- if (var.userType() == QMetaType::Nullptr)
- return;
-
- if (QQuickItem *item = var.value<QQuickItem *>())
- removeItem(item);
- else
- takeItem(var.toInt());
-}
-
-/*!
\since QtQuick.Controls 2.3 (Qt 5.10)
\qmlmethod void QtQuick.Controls::Menu::removeItem(Item item)
diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h
index 17479dc7..de252bf8 100644
--- a/src/quicktemplates2/qquickmenu_p.h
+++ b/src/quicktemplates2/qquickmenu_p.h
@@ -81,8 +81,7 @@ public:
Q_INVOKABLE void addItem(QQuickItem *item);
Q_INVOKABLE void insertItem(int index, QQuickItem *item);
Q_INVOKABLE void moveItem(int from, int to);
- Q_INVOKABLE void removeItem(const QVariant &item); // ### Qt 6: remove
- void removeItem(QQuickItem *item); // ### Qt 6: Q_INVOKABLE
+ Q_INVOKABLE void removeItem(QQuickItem *item);
QVariant contentModel() const;
QQmlListProperty<QObject> contentData();
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()