QQuickMenuBar: Remove native menus from native menubar on destruction

The native menus are deleted because they're usually children
of the menubar. But we still keep references in QCocoaMenuBar
until we manually remove those form the menu list.

Change-Id: I1651852b6ebc578ca308d69299de4c12764f7363
Task-number: QTBUG-47233
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/src/controls/qquickmenubar.cpp b/src/controls/qquickmenubar.cpp
index 52f2d1eb..efec6510 100644
--- a/src/controls/qquickmenubar.cpp
+++ b/src/controls/qquickmenubar.cpp
@@ -72,6 +72,8 @@ QQuickMenuBar::QQuickMenuBar(QObject *parent)
 
 QQuickMenuBar::~QQuickMenuBar()
 {
+    if (isNative())
+        setNativeNoNotify(false);
 }
 
 QQmlListProperty<QQuickMenu> QQuickMenuBar::menus()
@@ -87,6 +89,13 @@ bool QQuickMenuBar::isNative() const
 void QQuickMenuBar::setNative(bool native)
 {
     bool wasNative = isNative();
+    setNativeNoNotify(native);
+    if (isNative() != wasNative)
+        emit nativeChanged();
+}
+
+void QQuickMenuBar::setNativeNoNotify(bool native)
+{
     if (native) {
         if (!m_platformMenuBar) {
             m_platformMenuBar = QGuiApplicationPrivate::platformTheme()->createPlatformMenuBar();
@@ -104,8 +113,6 @@ void QQuickMenuBar::setNative(bool native)
         delete m_platformMenuBar;
         m_platformMenuBar = 0;
     }
-    if (isNative() != wasNative)
-        emit nativeChanged();
 }
 
 void QQuickMenuBar::setContentItem(QQuickItem *item)
diff --git a/src/controls/qquickmenubar_p.h b/src/controls/qquickmenubar_p.h
index d0bbedce..83166d77 100644
--- a/src/controls/qquickmenubar_p.h
+++ b/src/controls/qquickmenubar_p.h
@@ -81,6 +81,7 @@ public:
     QPlatformMenuBar *platformMenuBar() const { return m_platformMenuBar; }
 
 private:
+    void setNativeNoNotify(bool native);
     static void append_menu(QQmlListProperty<QQuickMenu> *list, QQuickMenu *menu);
     static int count_menu(QQmlListProperty<QQuickMenu> *list);
     static QQuickMenu *at_menu(QQmlListProperty<QQuickMenu> *list, int index);