1 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 6b17180d42..91ee3a8531 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -109,9 +109,6 @@ IOutputPane::IOutputPane(QObject *parent)
 
 IOutputPane::~IOutputPane()
 {
-    if (m_context)
-        ICore::removeContextObject(m_context);
-
     const int i = Utils::indexOf(g_outputPanes, Utils::equal(&OutputPaneData::pane, this));
     QTC_ASSERT(i >= 0, return);
     delete g_outputPanes.at(i).button;
@@ -391,11 +388,11 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
 
     StatusBarManager::addStatusBarWidget(m_buttonsWidget, StatusBarManager::Second);
 
-    ActionContainer *mwindow = ActionManager::actionContainer(Constants::M_WINDOW);
+    ActionContainer *mview = ActionManager::actionContainer(Constants::M_VIEW);
 
     // Window->Output Panes
-    ActionContainer *mpanes = ActionManager::createMenu(Constants::M_WINDOW_PANES);
-    mwindow->addMenu(mpanes, Constants::G_WINDOW_PANES);
+    ActionContainer *mpanes = ActionManager::createMenu(Constants::M_VIEW_PANES);
+    mview->addMenu(mpanes, Constants::G_VIEW_PANES);
     mpanes->menu()->setTitle(tr("Output &Panes"));
     mpanes->appendGroup("Coreplugin.OutputPane.ActionsGroup");
     mpanes->appendGroup("Coreplugin.OutputPane.PanesGroup");
@@ -814,7 +811,7 @@ QSize OutputPaneToggleButton::sizeHint() const
     if (!m_badgeNumberLabel.text().isNull())
         s.rwidth() += m_badgeNumberLabel.sizeHint().width() + 1;
 
-    return s.expandedTo(QApplication::globalStrut());
+    return s;
 }
 
 void OutputPaneToggleButton::paintEvent(QPaintEvent*)
@@ -937,7 +934,7 @@ OutputPaneManageButton::OutputPaneManageButton()
 QSize OutputPaneManageButton::sizeHint() const
 {
     ensurePolished();
-    return QSize(numberAreaWidth(), QApplication::globalStrut().height());
+    return QSize(numberAreaWidth(), 16);
 }
 
 void OutputPaneManageButton::paintEvent(QPaintEvent*)