forked from qt-creator/qt-creator
Analyzer: Use Utils::OutputFormat everywhere
Replace hard distinction between 'out', 'err' with flexible OutputFormat. Also make sure that QmlProfiler shows application output. Change-Id: I130c71884321e4c59c9a75f0836c37a7f0e805c4 Reviewed-on: http://codereview.qt.nokia.com/458 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
This commit is contained in:
@@ -76,10 +76,8 @@ AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp,
|
||||
IAnalyzerTool *tool = AnalyzerManager::instance()->currentTool();
|
||||
d->m_engine = tool->createEngine(sp, runConfiguration);
|
||||
|
||||
connect(d->m_engine, SIGNAL(standardErrorReceived(QString)),
|
||||
SLOT(receiveStandardError(QString)));
|
||||
connect(d->m_engine, SIGNAL(standardOutputReceived(QString)),
|
||||
SLOT(receiveStandardOutput(QString)));
|
||||
connect(d->m_engine, SIGNAL(outputReceived(QString,Utils::OutputFormat)),
|
||||
SLOT(receiveOutput(QString,Utils::OutputFormat)));
|
||||
connect(d->m_engine, SIGNAL(taskToBeAdded(ProjectExplorer::Task::TaskType,QString,QString,int)),
|
||||
SLOT(addTask(ProjectExplorer::Task::TaskType,QString,QString,int)));
|
||||
connect(d->m_engine, SIGNAL(finished()),
|
||||
@@ -138,14 +136,9 @@ QIcon AnalyzerRunControl::icon() const
|
||||
return QIcon(QLatin1String(":/images/analyzer_start_small.png"));
|
||||
}
|
||||
|
||||
void AnalyzerRunControl::receiveStandardOutput(const QString &text)
|
||||
void AnalyzerRunControl::receiveOutput(const QString &text, Utils::OutputFormat format)
|
||||
{
|
||||
appendMessage(text, Utils::StdOutFormat);
|
||||
}
|
||||
|
||||
void AnalyzerRunControl::receiveStandardError(const QString &text)
|
||||
{
|
||||
appendMessage(text, Utils::StdErrFormat);
|
||||
appendMessage(text, format);
|
||||
}
|
||||
|
||||
void AnalyzerRunControl::addTask(ProjectExplorer::Task::TaskType type, const QString &description,
|
||||
|
||||
Reference in New Issue
Block a user