From 5f21a864b37e2ab12c462121526e0bbbf48caa14 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 1 Mar 2011 13:23:49 +0100
Subject: [PATCH] Fix parsing of gcc include path output

Reviewed-By: hunger
---
 src/plugins/projectexplorer/gcctoolchain.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index e0a2023c302..77573066e0b 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -86,7 +86,8 @@ static QByteArray runGcc(const QString &gcc, const QStringList &arguments, const
         qWarning("%s: '%s' crashed.", Q_FUNC_INFO, qPrintable(gcc));
         return QByteArray();
     }
-    return cpp.readAllStandardOutput();
+
+    return cpp.readAllStandardOutput() + "\n" + cpp.readAllStandardError();
 }
 
 static QByteArray gccPredefinedMacros(const QString &gcc, const QStringList &env)
@@ -126,6 +127,7 @@ static QList<HeaderPath> gccHeaderPathes(const QString &gcc, const QStringList &
     QByteArray line;
     QByteArray data = runGcc(gcc, arguments, env);
     QBuffer cpp(&data);
+    cpp.open(QIODevice::ReadOnly);
     while (cpp.canReadLine()) {
         line = cpp.readLine();
         if (line.startsWith("#include"))