forked from qt-creator/qt-creator
BlackBerry: Refactor parsing of blackberry-* processes output
This moves the parsing of the output from all blackberry-* processes used in the deploy steps, and when launching the application on the device, to a separate class. Errors and warnings coming from those processes will have issues added to the Issues tab. Change-Id: I455b26d77301bdfe93ece2c8470526ed174a50ed Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
committed by
Tobias Nätterlund
parent
7ae31f2ea9
commit
42eeb6ecdc
@@ -53,6 +53,8 @@ BlackBerryAbstractDeployStep::BlackBerryAbstractDeployStep(ProjectExplorer::Buil
|
||||
, m_futureInterface(0)
|
||||
, m_eventLoop(0)
|
||||
{
|
||||
connect(&m_outputParser, SIGNAL(addTask(ProjectExplorer::Task)), this, SIGNAL(addTask(ProjectExplorer::Task)));
|
||||
connect(&m_outputParser, SIGNAL(progressParsed(int)), this, SLOT(reportProgress(int)));
|
||||
}
|
||||
|
||||
BlackBerryAbstractDeployStep::BlackBerryAbstractDeployStep(ProjectExplorer::BuildStepList *bsl, BlackBerryAbstractDeployStep *bs)
|
||||
@@ -63,6 +65,8 @@ BlackBerryAbstractDeployStep::BlackBerryAbstractDeployStep(ProjectExplorer::Buil
|
||||
, m_futureInterface(0)
|
||||
, m_eventLoop(0)
|
||||
{
|
||||
connect(&m_outputParser, SIGNAL(addTask(ProjectExplorer::Task)), this, SIGNAL(addTask(ProjectExplorer::Task)));
|
||||
connect(&m_outputParser, SIGNAL(progressParsed(int)), this, SLOT(reportProgress(int)));
|
||||
}
|
||||
|
||||
BlackBerryAbstractDeployStep::~BlackBerryAbstractDeployStep()
|
||||
@@ -196,6 +200,7 @@ void BlackBerryAbstractDeployStep::processReadyReadStdOutput()
|
||||
|
||||
void BlackBerryAbstractDeployStep::stdOutput(const QString &line)
|
||||
{
|
||||
m_outputParser.stdOutput(line);
|
||||
emit addOutput(line, BuildStep::NormalOutput, BuildStep::DontAppendNewline);
|
||||
}
|
||||
|
||||
@@ -238,5 +243,6 @@ void BlackBerryAbstractDeployStep::handleProcessFinished(int exitCode, QProcess:
|
||||
|
||||
void BlackBerryAbstractDeployStep::stdError(const QString &line)
|
||||
{
|
||||
m_outputParser.stdError(line);
|
||||
emit addOutput(line, BuildStep::ErrorOutput, BuildStep::DontAppendNewline);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user