diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-12 14:15:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-12 14:24:03 +0000 |
| commit | 5232a0c4005e743942c8f371aeb1ba024d4d4d03 (patch) | |
| tree | 0432d1da2e9e10460f0497583788b935fe0d1c44 /src/quicktemplates2/qquickmenu_p.h | |
| parent | 732b6608b9357d957eb9d2676fe7207b65c1b73f (diff) | |
Add QQuickMenuPrivate::setParentMenu()
To help propagating the cascade-property automatically, instead of
doing it manually in openSubMenu() that we're trying to get rid of.
Change-Id: I3a3d59cafccc85d6affc325eb60e717e22b8f812
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index 1211172b..9eeeadd6 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -66,7 +66,7 @@ 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(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) @@ -103,6 +103,7 @@ public: bool cascade() const; void setCascade(bool cascade); + void resetCascade(); qreal overlap() const; void setOverlap(qreal overlap); @@ -124,7 +125,7 @@ protected: Q_SIGNALS: void titleChanged(const QString &title); - Q_REVISION(3) void cascadeChanged(); + Q_REVISION(3) void cascadeChanged(bool cascade); Q_REVISION(3) void overlapChanged(); Q_REVISION(3) void delegateChanged(); Q_REVISION(3) void currentIndexChanged(); |