Changes: Fix MNavigationBarView to delete its widgets when destroyed.

RevBy: Daniel d'Andrada
Details: also make sure that the toolbar is getting shown when placed in
the dock widget.

3 files changed, 8 insertions, 2 deletions

diff --git a/src/corelib/widgets/mdockwidget.cpp b/src/corelib/widgets/mdockwidget.cpp
index 92451d78..c51d7210 100644
--- a/src/corelib/widgets/mdockwidget.cpp
+++ b/src/corelib/widgets/mdockwidget.cpp
@@ -79,6 +79,7 @@ void MDockWidget::dockToolBar(MToolBar *toolbar)
     if (0 != toolbar) {
         d->layout->addItem(toolbar);
         d->toolbar->setParentItem(this);
+        d->toolbar->show();
     }
 }
 
diff --git a/src/views/mnavigationbarview.cpp b/src/views/mnavigationbarview.cpp
index d1407729..807f88d1 100644
--- a/src/views/mnavigationbarview.cpp
+++ b/src/views/mnavigationbarview.cpp
@@ -46,6 +46,10 @@ MNavigationBarViewPrivate::MNavigationBarViewPrivate()
 
 MNavigationBarViewPrivate::~MNavigationBarViewPrivate()
 {
+    if (toolBar)
+        layout->removeItem(toolBar);
+
+    delete applicationMenuButton;
 }
 
 void MNavigationBarViewPrivate::init()
diff --git a/src/views/mnavigationbarview_p.h b/src/views/mnavigationbarview_p.h
index da987f9c..a5ea5445 100644
--- a/src/views/mnavigationbarview_p.h
+++ b/src/views/mnavigationbarview_p.h
@@ -21,11 +21,12 @@
 #define MNAVIGATIONBARVIEW_P_H
 
 #include "mscenewindowview_p.h"
+#include "mtoolbar.h"
+#include <QPointer>
 
 class MNavigationBar;
 class MApplicationMenuButton;
 class MWidget;
-class MToolBar;
 class QGraphicsGridLayout;
 class QGraphicsLinearLayout;
 
@@ -49,7 +50,7 @@ public:
     QGraphicsLinearLayout *layout;
 
     MApplicationMenuButton *applicationMenuButton;
-    MToolBar *toolBar;
+    QPointer<MToolBar> toolBar;
 };
 
 #endif