diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-01 23:36:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-13 09:34:39 +0000 |
| commit | 92fcd0a3fb2ee0d1ba242607c1aa5a29864d3650 (patch) | |
| tree | e55ace5afc75cfaa17f2571fda8cfae2d8f4e9f8 /src/quicktemplates2/qquickmenuitem_p.h | |
| parent | 23a80af1b5d31621bf1d342706c9541dd5273b86 (diff) | |
Add support for cascading sub-menus
This commit adds initial support for cascading sub-menus by allowing
one to nest declarative Menu declarations. A follow-up commit adds
support for adding, inserting, and removing menus programmatically.
[ChangeLog][Controls][Menu] Added support for cascading sub-menus.
Task-number: QTBUG-60351
Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenuitem_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenuitem_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h index 92b42488..7c469b6a 100644 --- a/src/quicktemplates2/qquickmenuitem_p.h +++ b/src/quicktemplates2/qquickmenuitem_p.h @@ -59,7 +59,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuItem : public QQuickAbstractBut { Q_OBJECT Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) + Q_PROPERTY(QQuickItem *arrow READ arrow WRITE setArrow NOTIFY arrowChanged FINAL REVISION 3) Q_PROPERTY(QQuickMenu *menu READ menu NOTIFY menuChanged FINAL REVISION 3) + Q_PROPERTY(QQuickMenu *subMenu READ subMenu NOTIFY subMenuChanged FINAL REVISION 3) public: explicit QQuickMenuItem(QQuickItem *parent = nullptr); @@ -67,12 +69,18 @@ public: bool isHighlighted() const; void setHighlighted(bool highlighted); + QQuickItem *arrow() const; + void setArrow(QQuickItem *arrow); + QQuickMenu *menu() const; + QQuickMenu *subMenu() const; Q_SIGNALS: void triggered(); void highlightedChanged(); + Q_REVISION(3) void arrowChanged(); Q_REVISION(3) void menuChanged(); + Q_REVISION(3) void subMenuChanged(); protected: QFont defaultFont() const override; |