From 6a9c9710aa7f2b7bd6fd09f27f8bb352d496bc25 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Date: Fri, 25 Sep 2015 11:06:42 +0200
Subject: Menu: Fix crash when running the event loop on item trigger

We are obviously deleting the menu popup contents too early. A fix and
ammendment for QTBUG-45182, QTBUG-47682 and QTBUG-48382 is in progress
and will be merged in after 5.5.1.

This effectively reverts 3799188e704e48ff8e9aa72.

Task-number: QTBUG-48382
Change-Id: I38c9e20d710d0bf41810640e5bf83f477abf2934
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/controls/Menu.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index 0eb0c357..7334c28c 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -150,7 +150,7 @@ MenuPrivate {
     /*! \internal */
     property int __currentIndex: -1
     /*! \internal */
-    onAboutToHide: { __currentIndex = -1; __destroyMenuPopup() }
+    onAboutToHide: __currentIndex = -1
     on__MenuPopupDestroyed: contentLoader.active = false
     onPopupVisibleChanged: {
         if (__popupVisible)
-- 
cgit v1.2.1