From 1c40734f87fa10934d7cee430027b478c2ceaf58 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Date: Thu, 18 Sep 2014 12:50:32 +0200
Subject: qquickmenu: implement support for __closeMenu when using native menus

Change-Id: I6ba0924d0dd90b87426f4315bd36496cbd4ad7f5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/controls/qquickmenu.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/controls/qquickmenu.cpp')

diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index f96a326e..2bcd0244 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -453,8 +453,11 @@ QRect QQuickMenu::popupGeometry() const
 void QQuickMenu::__closeMenu()
 {
     setPopupVisible(false);
-    if (m_popupWindow)
+    if (m_platformMenu)
+        m_platformMenu->setVisible(false);
+    else if (m_popupWindow)
         m_popupWindow->setVisible(false);
+
     m_parentWindow = 0;
     emit __menuClosed();
 }
-- 
cgit v1.2.1