feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Remove the QbsParser class

Browse Source 
It serves no purpose.

Change-Id: I92e700ed5c1d2b72398f4c7b88dab0cea9404e4d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-04-07 12:50:53 +02:00
parent c54107b125
commit b22bb5a9a7
7 changed files with 13 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -26,7 +26,6 @@
#include "qbsbuildstep.h"
#include "qbsbuildconfiguration.h"
#include "qbsparser.h"
#include "qbsproject.h"
#include "qbsprojectmanagerconstants.h"
#include "qbssession.h"
@@ -35,6 +34,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/variablechooser.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/ioutputparser.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
@@ -60,7 +60,6 @@
// --------------------------------------------------------------------
const char QBS_CONFIG[] = "Qbs.Configuration";
const char QBS_DRY_RUN[] = "Qbs.DryRun";
const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
const char QBS_MAXJOBCOUNT[] = "Qbs.MaxJobs";
const char QBS_SHOWCOMMANDLINES[] = "Qbs.ShowCommandLines";
@@ -170,17 +169,14 @@ bool QbsBuildStep::init()
return false;
delete m_parser;
m_parser = new Internal::QbsParser;
ProjectExplorer::IOutputParser *parser = target()->kit()->createOutputParser();
if (parser)
m_parser->appendOutputParser(parser);
m_parser = target()->kit()->createOutputParser();
if (m_parser)
connect(m_parser, &ProjectExplorer::IOutputParser::addTask, this, &QbsBuildStep::addTask);
m_changedFiles = bc->changedFiles();
m_activeFileTags = bc->activeFileTags();
m_products = bc->products();
connect(m_parser, &ProjectExplorer::IOutputParser::addTask, this, &QbsBuildStep::addTask);
return true;
}
@@ -379,18 +375,22 @@ void QbsBuildStep::handleProcessResult(
if (success && !hasOutput)
return;
m_parser->setWorkingDirectory(workingDir);
if (m_parser)
m_parser->setWorkingDirectory(workingDir);
emit addOutput(executable.toUserOutput() + ' ' + QtcProcess::joinArgs(arguments),
OutputFormat::Stdout);
for (const QString &line : stdErr) {
m_parser->handleStderr(line + '\n');
if (m_parser)
m_parser->handleStderr(line + '\n');
emit addOutput(line, OutputFormat::Stderr);
}
for (const QString &line : stdOut) {
m_parser->handleStdout(line + '\n');
if (m_parser)
m_parser->handleStdout(line + '\n');
emit addOutput(line, OutputFormat::Stdout);
}
m_parser->flush();
if (m_parser)
m_parser->flush();
}
void QbsBuildStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, const QString &message,