From 61db1507f30082c661c46410115ca74f74842ca7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 17 Nov 2015 14:04:59 +0100 Subject: Fix proxy menu crash Mobile-centric ApplicationWindowStyle implementations (Flat & Android) use a proxy menu to morph menubar items into a single menu button. The items are owned by the menubar and must not be deleted by the proxy menu. Otherwise, depending on the destruction order, the items would get deleted twice. Change-Id: I92d0c45fc3274574fd1edf34d8d3d081990f2727 Task-number: QTBUG-48927 Reviewed-by: Mitch Curtis --- src/extras/Styles/Flat/ApplicationWindowStyle.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/extras') diff --git a/src/extras/Styles/Flat/ApplicationWindowStyle.qml b/src/extras/Styles/Flat/ApplicationWindowStyle.qml index 248e39d4..db714889 100644 --- a/src/extras/Styles/Flat/ApplicationWindowStyle.qml +++ b/src/extras/Styles/Flat/ApplicationWindowStyle.qml @@ -96,6 +96,7 @@ Base.ApplicationWindowStyle { Menu { id: proxyMenu + __isProxy: true items: control.menuBar ? control.menuBar.menus : [] } -- cgit v1.2.1