forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/8.0'
Change-Id: Icef5e28557701243e686d35cf885412eb341e75a
This commit is contained in:
@@ -185,11 +185,6 @@ QString NinjaBuildStep::defaultBuildTarget() const
|
||||
return {Constants::Targets::all};
|
||||
}
|
||||
|
||||
void NinjaBuildStep::doRun()
|
||||
{
|
||||
AbstractProcessStep::doRun();
|
||||
}
|
||||
|
||||
void NinjaBuildStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
|
||||
{
|
||||
auto mesonOutputParser = new MesonOutputParser;
|
||||
|
||||
@@ -52,7 +52,6 @@ public:
|
||||
|
||||
private:
|
||||
void update(bool parsingSuccessful);
|
||||
void doRun() override;
|
||||
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
|
||||
QString defaultBuildTarget() const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user