feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix parsing of gcc include path output

Browse Source 
Reviewed-By: hunger
This commit is contained in:
dt
2011-03-01 13:23:49 +01:00
parent 359ab05686
commit 5f21a864b3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -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"))