diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-06-10 16:34:06 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-06-14 10:14:19 +0200 |
| commit | 73b66f5d080052ebcd705b3ab940456c43ddd32c (patch) | |
| tree | 13a4ed6a054dac95d8689f251b970f6e07f1ff76 /src/plugins/analyzerbase/analyzerruncontrol.cpp | |
| parent | 83566c3c3af2adfab23561983306a239f32c1e00 (diff) | |
| download | qt-creator-73b66f5d080052ebcd705b3ab940456c43ddd32c.tar.gz | |
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>
Diffstat (limited to 'src/plugins/analyzerbase/analyzerruncontrol.cpp')
| -rw-r--r-- | src/plugins/analyzerbase/analyzerruncontrol.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp index 22198afe9f..e5ef66d76d 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp @@ -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, |