From 633c11d184df22724e2a401a311b805827eabbd5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 2 May 2013 16:13:18 +0200 Subject: 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: Kai Koehne Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/makestep.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 9d290202c7..d6768b1dab 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -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); -- cgit v1.2.1