Commit 7000f7ca authored by hjk's avatar hjk

projectexplorer: move runcontrol/outputwindow connection to outputwindow

parent b4d6a5ba
......@@ -246,6 +246,8 @@ void OutputPane::createNewOutputWindow(RunControl *rc)
this, SLOT(runControlStarted()));
connect(rc, SIGNAL(finished()),
this, SLOT(runControlFinished()));
connect(rc, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat)),
this, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat)));
// First look if we can reuse a tab
const int size = m_runControlTabs.size();
......
......@@ -89,6 +89,7 @@ public:
void goToPrev();
bool canNavigate();
void createNewOutputWindow(RunControl *rc);
void showTabFor(RunControl *rc);
bool aboutToClose() const;
......@@ -99,7 +100,6 @@ signals:
public slots:
// ApplicationOutput specifics
void createNewOutputWindow(RunControl *rc);
void projectRemoved();
void appendMessage(ProjectExplorer::RunControl *rc, const QString &out,
......
......@@ -1386,13 +1386,7 @@ void ProjectExplorerPlugin::startRunControl(RunControl *runControl, const QStrin
if (runMode == ProjectExplorer::Constants::RUNMODE)
d->m_outputPane->popup(false);
d->m_outputPane->showTabFor(runControl);
connect(runControl, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat)),
d->m_outputPane, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat)));
connect(runControl, SIGNAL(finished()),
this, SLOT(runControlFinished()));
connect(runControl, SIGNAL(finished()), this, SLOT(runControlFinished()));
runControl->start();
emit updateRunActions();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment