diff options
Diffstat (limited to 'src/quicktemplates2/qquickmenu_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p.h | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index de252bf8..2646cffa 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -67,12 +67,14 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenu : public QQuickPopup Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) // 2.3 (Qt 5.10) - Q_PROPERTY(int count READ count NOTIFY countChanged FINAL REVISION 3) - Q_PROPERTY(bool cascade READ cascade WRITE setCascade RESET resetCascade NOTIFY cascadeChanged FINAL REVISION 3) - Q_PROPERTY(qreal overlap READ overlap WRITE setOverlap NOTIFY overlapChanged FINAL REVISION 3) - Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL REVISION 3) - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL REVISION 3) + Q_PROPERTY(int count READ count NOTIFY countChanged FINAL REVISION(2, 3)) + Q_PROPERTY(bool cascade READ cascade WRITE setCascade RESET resetCascade NOTIFY cascadeChanged FINAL REVISION(2, 3)) + Q_PROPERTY(qreal overlap READ overlap WRITE setOverlap NOTIFY overlapChanged FINAL REVISION(2, 3)) + Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL REVISION(2, 3)) + Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL REVISION(2, 3)) Q_CLASSINFO("DefaultProperty", "contentData") + QML_NAMED_ELEMENT(Menu) + QML_ADDED_IN_VERSION(2, 0) public: explicit QQuickMenu(QObject *parent = nullptr); @@ -104,25 +106,25 @@ public: // 2.3 (Qt 5.10) int count() const; - Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); + Q_REVISION(2, 3) Q_INVOKABLE QQuickItem *takeItem(int index); - Q_REVISION(3) Q_INVOKABLE QQuickMenu *menuAt(int index) const; - Q_REVISION(3) Q_INVOKABLE void addMenu(QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE void insertMenu(int index, QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE void removeMenu(QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE QQuickMenu *takeMenu(int index); + Q_REVISION(2, 3) Q_INVOKABLE QQuickMenu *menuAt(int index) const; + Q_REVISION(2, 3) Q_INVOKABLE void addMenu(QQuickMenu *menu); + Q_REVISION(2, 3) Q_INVOKABLE void insertMenu(int index, QQuickMenu *menu); + Q_REVISION(2, 3) Q_INVOKABLE void removeMenu(QQuickMenu *menu); + Q_REVISION(2, 3) Q_INVOKABLE QQuickMenu *takeMenu(int index); - Q_REVISION(3) Q_INVOKABLE QQuickAction *actionAt(int index) const; - Q_REVISION(3) Q_INVOKABLE void addAction(QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE void insertAction(int index, QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE void removeAction(QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE QQuickAction *takeAction(int index); + Q_REVISION(2, 3) Q_INVOKABLE QQuickAction *actionAt(int index) const; + Q_REVISION(2, 3) Q_INVOKABLE void addAction(QQuickAction *action); + Q_REVISION(2, 3) Q_INVOKABLE void insertAction(int index, QQuickAction *action); + Q_REVISION(2, 3) Q_INVOKABLE void removeAction(QQuickAction *action); + Q_REVISION(2, 3) Q_INVOKABLE QQuickAction *takeAction(int index); void popup(QQuickItem *menuItem = nullptr); void popup(const QPointF &pos, QQuickItem *menuItem = nullptr); - Q_REVISION(3) Q_INVOKABLE void popup(QQmlV4Function *args); - Q_REVISION(3) Q_INVOKABLE void dismiss(); + Q_REVISION(2, 3) Q_INVOKABLE void popup(QQmlV4Function *args); + Q_REVISION(2, 3) Q_INVOKABLE void dismiss(); protected: void componentComplete() override; @@ -133,11 +135,11 @@ protected: Q_SIGNALS: void titleChanged(const QString &title); // 2.3 (Qt 5.10) - Q_REVISION(3) void countChanged(); - Q_REVISION(3) void cascadeChanged(bool cascade); - Q_REVISION(3) void overlapChanged(); - Q_REVISION(3) void delegateChanged(); - Q_REVISION(3) void currentIndexChanged(); + Q_REVISION(2, 3) void countChanged(); + Q_REVISION(2, 3) void cascadeChanged(bool cascade); + Q_REVISION(2, 3) void overlapChanged(); + Q_REVISION(2, 3) void delegateChanged(); + Q_REVISION(2, 3) void currentIndexChanged(); protected: void timerEvent(QTimerEvent *event) override; |