diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-09-22 13:35:48 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-09-22 15:18:46 +0200 |
| commit | 01c61ccee62290ec8c7fce3eb97fa403c59736fd (patch) | |
| tree | 651d4003ed816803347518a0c059f3a22ceeb825 /src/controls/qquickmenu.cpp | |
| parent | fa6c560882e0fe61a16dcf3347940d1b76c0a678 (diff) | |
| download | qtquickcontrols-01c61ccee62290ec8c7fce3eb97fa403c59736fd.tar.gz | |
Revert "qquickmenu: implement support for __closeMenu when using native menus"
This showed not to be the correct solution, since hiding
a (sub) menu will make the menu appear removed from the
parent menu the next time the parent menu opens.
This reverts commit 1c40734f87fa10934d7cee430027b478c2ceaf58.
Change-Id: Ife071348c93d630ad372aea66fd848885aef032b
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/qquickmenu.cpp')
| -rw-r--r-- | src/controls/qquickmenu.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index 2bcd0244..f96a326e 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -453,11 +453,8 @@ QRect QQuickMenu::popupGeometry() const void QQuickMenu::__closeMenu() { setPopupVisible(false); - if (m_platformMenu) - m_platformMenu->setVisible(false); - else if (m_popupWindow) + if (m_popupWindow) m_popupWindow->setVisible(false); - m_parentWindow = 0; emit __menuClosed(); } |