diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 8bb13412256..4ff83030f4c 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -135,7 +135,6 @@ AppOutputPane::RunControlTab::RunControlTab(RunControl *runControl, Core::Output } AppOutputPane::AppOutputPane() : - m_mainWidget(new QWidget), m_tabWidget(new TabWidget), m_stopAction(new QAction(tr("Stop"), this)), m_closeCurrentTabAction(new QAction(tr("Close Tab"), this)), @@ -200,28 +199,24 @@ AppOutputPane::AppOutputPane() : // Spacer (?) - auto *layout = new QVBoxLayout; - layout->setContentsMargins(0, 0, 0, 0); m_tabWidget->setDocumentMode(true); m_tabWidget->setTabsClosable(true); m_tabWidget->setMovable(true); connect(m_tabWidget, &QTabWidget::tabCloseRequested, this, [this](int index) { closeTab(index); }); - layout->addWidget(m_tabWidget); - connect(m_tabWidget, &QTabWidget::currentChanged, this, &AppOutputPane::tabChanged); + connect(m_tabWidget, &QTabWidget::currentChanged, + this, &AppOutputPane::tabChanged); connect(m_tabWidget, &TabWidget::contextMenuRequested, this, &AppOutputPane::contextMenuRequested); - m_mainWidget->setLayout(layout); - connect(SessionManager::instance(), &SessionManager::aboutToUnloadSession, this, &AppOutputPane::aboutToUnloadSession); setupFilterUi("AppOutputPane.Filter"); setFilteringEnabled(false); setZoomButtonsEnabled(false); - setupContext("Core.AppOutputPane", m_mainWidget); + setupContext("Core.AppOutputPane", m_tabWidget); } AppOutputPane::~AppOutputPane() @@ -232,7 +227,7 @@ AppOutputPane::~AppOutputPane() delete rt.window; delete rt.runControl; } - delete m_mainWidget; + delete m_tabWidget; ExtensionSystem::PluginManager::removeObject(m_handler); delete m_handler; } @@ -299,7 +294,7 @@ void AppOutputPane::aboutToUnloadSession() QWidget *AppOutputPane::outputWidget(QWidget *) { - return m_mainWidget; + return m_tabWidget; } QList AppOutputPane::toolBarWidgets() const diff --git a/src/plugins/projectexplorer/appoutputpane.h b/src/plugins/projectexplorer/appoutputpane.h index acc1924d604..f0f4b56eb90 100644 --- a/src/plugins/projectexplorer/appoutputpane.h +++ b/src/plugins/projectexplorer/appoutputpane.h @@ -14,7 +14,6 @@ #include QT_BEGIN_NAMESPACE -class QTabWidget; class QToolButton; class QAction; class QPoint; @@ -123,7 +122,6 @@ private: void loadSettings(); void storeSettings() const; - QWidget *m_mainWidget; TabWidget *m_tabWidget; QVector m_runControlTabs; int m_runControlCount = 0;