Commit 71730cf7 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix cmake to parse Qt build application output



Task-number: QTCREATORBUG-2450

Change-Id: I7e041aece19b863b59fe2b2164b126cf414f82a9
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 2f34671e
...@@ -36,9 +36,14 @@ ...@@ -36,9 +36,14 @@
#include "cmakeproject.h" #include "cmakeproject.h"
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/ioutputparser.h>
#include <projectexplorer/profileinformation.h> #include <projectexplorer/profileinformation.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtparser.h>
#include <qtsupport/qtprofileinformation.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QInputDialog> #include <QInputDialog>
...@@ -110,10 +115,16 @@ void CMakeBuildConfiguration::setBuildDirectory(const QString &buildDirectory) ...@@ -110,10 +115,16 @@ void CMakeBuildConfiguration::setBuildDirectory(const QString &buildDirectory)
ProjectExplorer::IOutputParser *CMakeBuildConfiguration::createOutputParser() const ProjectExplorer::IOutputParser *CMakeBuildConfiguration::createOutputParser() const
{ {
ProjectExplorer::IOutputParser *parserchain = new ProjectExplorer::GnuMakeParser;
int versionId = QtSupport::QtProfileInformation::qtVersionId(target()->profile());
if (versionId >= 0)
parserchain->appendOutputParser(new QtSupport::QtParser);
ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainProfileInformation::toolChain(target()->profile()); ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainProfileInformation::toolChain(target()->profile());
if (tc) if (tc)
return tc->outputParser(); parserchain->appendOutputParser(tc->outputParser());
return 0; return parserchain;
} }
Utils::Environment CMakeBuildConfiguration::baseEnvironment() const Utils::Environment CMakeBuildConfiguration::baseEnvironment() const
......
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