diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-02 16:13:18 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-02 16:46:59 +0200 |
| commit | 633c11d184df22724e2a401a311b805827eabbd5 (patch) | |
| tree | 56fbc94239556790c9702f89aab1899c4527de5c /src | |
| parent | 038f3c0c49f8b6ba64d9f87d5a3d38e7575eca21 (diff) | |
| download | qt-creator-633c11d184df22724e2a401a311b805827eabbd5.tar.gz | |
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 <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qt4projectmanager/makestep.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); |