diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 18:24:20 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 16:27:05 +0000 |
| commit | c97af72a01b8a0c2d8a0c069cdc6547a75bab6c6 (patch) | |
| tree | 34a1b23a92b67dd97e978db1303e793a51975a79 | |
| parent | 841e4355d394af0d29ca4dd64e6fb45f4d627189 (diff) | |
Add missing revision for takeItem()
Change-Id: Idac8b830efc228303346432d5bf0957b17a428a4
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickcontainer_p.h | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 8ac17d1b..e7e08e32 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -295,6 +295,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickApplicationWindow, 3>(uri, 2, 3, "ApplicationWindow"); qmlRegisterType<QQuickButtonGroup, 3>(uri, 2, 3, "ButtonGroup"); qmlRegisterType<QQuickControl, 3>(uri, 2, 3, "Control"); + qmlRegisterType<QQuickContainer, 3>(uri, 2, 3, "Container"); qmlRegisterType<QQuickDialog, 3>(uri, 2, 3, "Dialog"); qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 3, "DialogButtonBox"); qRegisterMetaType<QQuickIcon>(); diff --git a/src/quicktemplates2/qquickcontainer_p.h b/src/quicktemplates2/qquickcontainer_p.h index 4c1d26cc..5ac585c2 100644 --- a/src/quicktemplates2/qquickcontainer_p.h +++ b/src/quicktemplates2/qquickcontainer_p.h @@ -77,7 +77,7 @@ public: 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 QQuickItem *takeItem(int index); + Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); QVariant contentModel() const; QQmlListProperty<QObject> contentData(); diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index 4f05a7c9..03cd8f2b 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -77,7 +77,7 @@ public: 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 QQuickItem *takeItem(int index); + Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); QVariant contentModel() const; QQmlListProperty<QObject> contentData(); |