Commit 633c11d1 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Handle Qmake errors when running make in a qmake project



Qmake may be run by make, so make the makestep use the qmake parser
in addition to the rest in qmake based projects.

Change-Id: Ibdd3eb476d890d580a8417d691166c4dd33350cb
Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 038f3c0c
......@@ -30,6 +30,7 @@
#include "makestep.h"
#include "ui_makestep.h"
#include "qmakeparser.h"
#include "qt4project.h"
#include "qt4nodes.h"
#include "qt4buildconfiguration.h"
......@@ -254,6 +255,7 @@ bool MakeStep::init()
pp->resolveAll();
setOutputParser(new ProjectExplorer::GnuMakeParser());
appendOutputParser(new QMakeParser); // make may cause qmake to be run.
IOutputParser *parser = target()->kit()->createOutputParser();
if (parser)
appendOutputParser(parser);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment