From f90a861ccc5712313e6fc39d3f606e7036cacfd2 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 31 Oct 2014 13:45:27 +0100 Subject: [PATCH] ProjectExplorer: Normale newlines of gcc output ...otherwise the ClangCodeModel might pass on "-DHELLO=1\r" if MingwToolChain is used. Change-Id: I073ba5409822fed75ee30079ef985170acf98f13 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/gcctoolchain.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index bd896eeeaf0..9c0cf68a8bc 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -97,7 +97,8 @@ static QByteArray runGcc(const FileName &gcc, const QStringList &arguments, cons return QByteArray(); } - const QByteArray stdErr = cpp.readAllStandardError(); + const QByteArray stdErr = SynchronousProcess::normalizeNewlines( + QString::fromLocal8Bit(cpp.readAllStandardError())).toLocal8Bit(); if (cpp.exitCode() != 0) { qWarning().nospace() << Q_FUNC_INFO << ": " << gcc.toUserOutput() << ' ' @@ -106,7 +107,8 @@ static QByteArray runGcc(const FileName &gcc, const QStringList &arguments, cons return QByteArray(); } - QByteArray data = cpp.readAllStandardOutput(); + QByteArray data = SynchronousProcess::normalizeNewlines( + QString::fromLocal8Bit(cpp.readAllStandardOutput())).toLocal8Bit(); if (!data.isEmpty() && !data.endsWith('\n')) data.append('\n'); data.append(stdErr);