diff options
| author | Gabriel de Dietrich <[email protected]> | 2015-09-25 11:06:42 +0200 |
|---|---|---|
| committer | Jani Heikkinen <[email protected]> | 2015-09-25 10:35:27 +0000 |
| commit | 6a9c9710aa7f2b7bd6fd09f27f8bb352d496bc25 (patch) | |
| tree | 16817a3493a44a45ca2b363f7a0e46b92e5aee3b | |
| parent | 5796b7885da8f4b9a09d948b782d6353b6eaf715 (diff) | |
Menu: Fix crash when running the event loop on item triggerv5.5.1
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 <[email protected]>
| -rw-r--r-- | src/controls/Menu.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 0eb0c357f..7334c28cd 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) |