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

CMakeParser: Remove sub-parser setup from CMakeParser

Browse Source 
This makes the class more applicable for later re-use.

Change-Id: Ic717dd63962b254fce639061f16b1ca8e12d8098
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-02-12 12:34:35 +01:00
parent d400959d7e
commit c7d906214b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -35,6 +35,7 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
@@ -204,7 +205,8 @@ bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps)
pp->setArguments(arguments); pp->setArguments(arguments);
pp->resolveAll(); pp->resolveAll();
setOutputParser(new CMakeParser()); setOutputParser(new CMakeParser);
appendOutputParser(new GnuMakeParser);
IOutputParser *parser = target()->kit()->createOutputParser(); IOutputParser *parser = target()->kit()->createOutputParser();
if (parser) if (parser)
appendOutputParser(parser); appendOutputParser(parser);

3
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -27,7 +27,6 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
using namespace CMakeProjectManager; using namespace CMakeProjectManager;
@@ -50,8 +49,6 @@ CMakeParser::CMakeParser()
m_locationLine.setPattern(QLatin1String(LOCATION_LINE_PATTERN)); m_locationLine.setPattern(QLatin1String(LOCATION_LINE_PATTERN));
QTC_CHECK(m_locationLine.isValid()); QTC_CHECK(m_locationLine.isValid());
appendOutputParser(new GnuMakeParser());
} }
void CMakeParser::stdError(const QString &line) void CMakeParser::stdError(const QString &line)