From 48dd25866e9c2f5a5f0844cc5b72ab60f94d11bc Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 20 Apr 2009 12:18:32 +0200
Subject: [PATCH] Show also error output in the cmake run log.

---
 src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 0ed79cfc489..9e85318461f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -110,8 +110,9 @@ QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QStrin
     QString buildDirectoryPath = buildDirectory.absolutePath();
     qDebug()<<"Creating cbp file in"<<buildDirectoryPath;
     buildDirectory.mkpath(buildDirectoryPath);
-    QProcess * cmake = new QProcess;
+    QProcess *cmake = new QProcess;
     cmake->setWorkingDirectory(buildDirectoryPath);
+    cmake->setProcessChannelMode(QProcess::MergedChannels);
 
 #ifdef Q_OS_WIN
     QString generator = "-GCodeBlocks - MinGW Makefiles";