diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-05-08 13:41:53 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-05-11 11:48:06 +0200 |
| commit | e0b356af9e747171dbdfc0d2935336ef14b4839d (patch) | |
| tree | 65c05b70cc3f272ba7ddf0bc82a8a7e8efa7d6fa /src | |
| parent | 0d18bfe6b33afc38b65f23996f1e9ffb4fba6e69 (diff) | |
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 17 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p.h | 3 |
2 files changed, 1 insertions, 19 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(); |