From 71730cf79892267961c44e21c4c98c8ca59223a6 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 29 Jun 2012 11:19:03 +0200
Subject: [PATCH] Fix cmake to parse Qt build application output

Task-number: QTCREATORBUG-2450

Change-Id: I7e041aece19b863b59fe2b2164b126cf414f82a9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 .../cmakebuildconfiguration.cpp                   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 5597225e4a2..2bfb623ab8f 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -36,9 +36,14 @@
 #include "cmakeproject.h"
 
 #include <projectexplorer/buildsteplist.h>
+#include <projectexplorer/gnumakeparser.h>
+#include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/profileinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
+#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtparser.h>
+#include <qtsupport/qtprofileinformation.h>
 #include <utils/qtcassert.h>
 
 #include <QInputDialog>
@@ -110,10 +115,16 @@ void CMakeBuildConfiguration::setBuildDirectory(const QString &buildDirectory)
 
 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());
     if (tc)
-        return tc->outputParser();
-    return 0;
+        parserchain->appendOutputParser(tc->outputParser());
+    return parserchain;
 }
 
 Utils::Environment CMakeBuildConfiguration::baseEnvironment() const