diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-08-20 19:22:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2013-08-20 19:24:31 +0200 |
| commit | 3dbfd45f6f278f8e521fa9f035acf5310102b836 (patch) | |
| tree | f16cd11ceba046eb9d15872153d482fe81965c31 /src/controls/qquickmenu.cpp | |
| parent | b3f1ed3b3b359722dc692256cbb3b89818bab49b (diff) | |
| parent | 09b0cb956940f45deaf35392630bd05453558d43 (diff) | |
| download | qtquickcontrols-3dbfd45f6f278f8e521fa9f035acf5310102b836.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I97e6044a5d28ab875628e61ea67474f3c0a4ef4b
Diffstat (limited to 'src/controls/qquickmenu.cpp')
| -rw-r--r-- | src/controls/qquickmenu.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index 01fd30be..f2823f16 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qquickmenu_p.h" +#include "qquickmenubar_p.h" #include "qquickmenuitemcontainer_p.h" #include "qquickmenupopupwindow_p.h" @@ -110,7 +111,7 @@ QT_BEGIN_NAMESPACE \qmlproperty bool Menu::visible Whether the menu should be visible. This is only enabled when the menu is used as - a submenu. Its value defaults to \c true. + a submenu or in the menubar. Its value defaults to \c true. */ /*! @@ -271,6 +272,17 @@ QQuickMenu::~QQuickMenu() m_platformMenu = 0; } +void QQuickMenu::setVisible(bool v) +{ + QQuickMenuBase::setVisible(v); + if (m_platformMenu) { + m_platformMenu->setVisible(v); + QQuickMenuBar *menubar = qobject_cast<QQuickMenuBar *>(parent()); + if (menubar && menubar->platformMenuBar()) + menubar->platformMenuBar()->syncMenu(m_platformMenu); + } +} + void QQuickMenu::updateText() { if (m_platformMenu) |