From 081afb2a16eb9a85458d32b2365b301115fd2119 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@theqtcompany.com>
Date: Thu, 19 Feb 2015 15:45:49 +0100
Subject: Fix android menubar's menu not opening at the first press.

In case of selected item in submenu, call aboutToHide() on still
visible menus. This will allow quickquickcontrols to act
poperly when menus are closed.

This patch is a resubmission of
dbd6d158e3002689c4c367709d68744465ffd9ec which was merged to dev
although it should have targeted 5.5.

Task-number: QTBUG-42188
Change-Id: I868cc6fc8403f0586f35a1734e0cb026982f6063
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
---
 src/plugins/platforms/android/androidjnimenu.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp
index 4a8439d4a9..8018cef1dc 100644
--- a/src/plugins/platforms/android/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/androidjnimenu.cpp
@@ -350,6 +350,10 @@ namespace QtAndroidMenu
                 item->activated();
                 visibleMenu->aboutToHide();
                 visibleMenu = 0;
+                foreach (QAndroidPlatformMenu *menu, pendingContextMenus) {
+                    if (menu->isVisible())
+                        menu->aboutToHide();
+                }
                 pendingContextMenus.clear();
             }
         }
-- 
cgit v1.2.3