diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-18 15:19:06 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-18 15:19:06 +0200 |
| commit | 46f3cc477fc00aae887f085e063d6cb10bfdcd4c (patch) | |
| tree | 0585601759ccbae2ed2abecedaf16e06b80676d0 /src/controls/qquickmenuitem_p.h | |
| parent | 4c184095d378622fb0c3bb1692b331b3cc04e010 (diff) | |
| parent | 04e000d2b1719696581bb4ae6ec21e39236ef38c (diff) | |
| download | qtquickcontrols-46f3cc477fc00aae887f085e063d6cb10bfdcd4c.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
src/controls/qquickaction.cpp
Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
Diffstat (limited to 'src/controls/qquickmenuitem_p.h')
| -rw-r--r-- | src/controls/qquickmenuitem_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/qquickmenuitem_p.h b/src/controls/qquickmenuitem_p.h index 2751c25b..a0c70832 100644 --- a/src/controls/qquickmenuitem_p.h +++ b/src/controls/qquickmenuitem_p.h @@ -78,7 +78,7 @@ class QQuickMenuBase: public QObject Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged) Q_PROPERTY(QQuickMenuItemType::MenuItemType type READ type CONSTANT) - Q_PROPERTY(QQuickMenu *__parentMenu READ parentMenu CONSTANT) + Q_PROPERTY(QObject *__parentMenu READ parentMenuOrMenuBar CONSTANT) Q_PROPERTY(bool __isNative READ isNative CONSTANT) Q_PROPERTY(QQuickItem *__visualItem READ visualItem WRITE setVisualItem) @@ -93,6 +93,7 @@ public: virtual void setVisible(bool); QQuickMenu *parentMenu() const; + QObject *parentMenuOrMenuBar() const; virtual void setParentMenu(QQuickMenu *parentMenu); QQuickMenuItemContainer *container() const; |