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/qquickmenu_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/qquickmenu_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index 04186f1a..f7f56d45 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -65,6 +65,8 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenu : public QQuickPopup Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL) Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) + Q_PROPERTY(bool cascade READ cascade WRITE setCascade 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_CLASSINFO("DefaultProperty", "contentData") @@ -85,6 +87,12 @@ public: QString title() const; void setTitle(QString &title); + bool cascade() const; + void setCascade(bool cascade); + + qreal overlap() const; + void setOverlap(qreal overlap); + QQmlComponent *delegate() const; void setDelegate(QQmlComponent *delegate); @@ -98,6 +106,8 @@ protected: Q_SIGNALS: void titleChanged(const QString &title); + Q_REVISION(3) void cascadeChanged(); + Q_REVISION(3) void overlapChanged(); Q_REVISION(3) void delegateChanged(); protected: |