diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-03 15:56:58 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-03 16:46:07 +0200 |
| commit | 71709f316c823150067e9360fb79e0a333d85141 (patch) | |
| tree | 47aacfbfa9361b022ac53860395516b7b4e74ba2 /src | |
| parent | a2171c2d82b810e7f596f371a7d1d3cc6989a9dd (diff) | |
| download | qt-creator-71709f316c823150067e9360fb79e0a333d85141.tar.gz | |
Qt4PM: Reduce priority of qmake parser in makestep parser chain
This stops it from eating lines that are actually produced by
the compiler.
Change-Id: I725690eaee6fe223c7024299420a924b455d2723
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qt4projectmanager/makestep.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index d6768b1dab..5536885662 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -255,11 +255,12 @@ 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); outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory()); + appendOutputParser(new QMakeParser); // make may cause qmake to be run, add last to make sure + // it has a low priority. m_scriptTarget = (static_cast<Qt4Project *>(bc->target()->project())->rootQt4ProjectNode()->projectType() == ScriptTemplate); |