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

Handle Qmake errors when running make in a qmake project

Browse Source 
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 <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-05-02 16:13:18 +02:00
parent 038f3c0c49
commit 633c11d184
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -30,6 +30,7 @@
#include "makestep.h" #include "makestep.h"
#include "ui_makestep.h" #include "ui_makestep.h"
#include "qmakeparser.h"
#include "qt4project.h" #include "qt4project.h"
#include "qt4nodes.h" #include "qt4nodes.h"
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
@@ -254,6 +255,7 @@ bool MakeStep::init()
pp->resolveAll(); pp->resolveAll();
setOutputParser(new ProjectExplorer::GnuMakeParser()); setOutputParser(new ProjectExplorer::GnuMakeParser());
appendOutputParser(new QMakeParser); // make may cause qmake to be run.
IOutputParser *parser = target()->kit()->createOutputParser(); IOutputParser *parser = target()->kit()->createOutputParser();
if (parser) if (parser)
appendOutputParser(parser); appendOutputParser(parser);