QQuickMenu: dismiss platform menu, not only QQuickMenuPopupWindow

This patch will fill in the missing code path that tells a native
platform menu to dismiss when requested.

Change-Id: I2625fddd0a735ca9ec7fabaf783921a1f99caa1d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index 41f5833e..385db3c0 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -468,12 +468,16 @@ void QQuickMenu::__closeMenu()
 
 void QQuickMenu::__dismissMenu()
 {
-    QQuickMenuPopupWindow *topMenuWindow = m_popupWindow;
-    while (topMenuWindow) {
-        QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(topMenuWindow->transientParent());
-        if (!pw)
-            topMenuWindow->dismissPopup();
-        topMenuWindow = pw;
+    if (m_platformMenu) {
+        m_platformMenu->dismiss();
+    } else {
+        QQuickMenuPopupWindow *topMenuWindow = m_popupWindow;
+        while (topMenuWindow) {
+            QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(topMenuWindow->transientParent());
+            if (!pw)
+                topMenuWindow->dismissPopup();
+            topMenuWindow = pw;
+        }
     }
 }