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

Code polishing, continuing cb23999fbf

Browse Source 
Add more error messages to processes run for toolchain detection.
Move Windows-specific code to dbgwinutils, remove inclusion of
<windows.h>. Fix MinGW gcc 4.5 warnings.
This commit is contained in:
Friedemann Kleint
2010-09-09 09:58:17 +02:00
parent f63b316728
commit 97e7c12e3c
12 changed files with 141 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -199,7 +199,10 @@ static QByteArray gccPredefinedMacros(const QString &gcc, const QStringList &env
qWarning("Timeout running '%s'.", qPrintable(gcc));
return QByteArray();
}
if (cpp.exitStatus() != QProcess::NormalExit) {
qWarning("'%s' crashed.", qPrintable(gcc));
return QByteArray();
}
QByteArray predefinedMacros = cpp.readAllStandardOutput();
#ifdef Q_OS_MAC
// Turn off flag indicating Apple's blocks support
@@ -251,7 +254,10 @@ static QList<HeaderPath> gccSystemHeaderPaths(const QString &gcc, ProjectExplore
qWarning("Timeout running '%s'.", qPrintable(gcc));
return systemHeaderPaths;
}
if (cpp.exitStatus() != QProcess::NormalExit) {
qWarning("'%s' crashed.", qPrintable(gcc));
return systemHeaderPaths;
}
QByteArray line;
while (cpp.canReadLine()) {
line = cpp.readLine();
@@ -659,6 +665,11 @@ static QByteArray msvcPredefinedMacros(const QStringList &env)
qWarning("Timeout running '%s'.", qPrintable(binary));
return predefinedMacros;
}
if (cpp.exitStatus() != QProcess::NormalExit) {
qWarning("'%s' crashed.", qPrintable(binary));
return predefinedMacros;
}
const QList<QByteArray> output = cpp.readAllStandardOutput().split('\n');
foreach (const QByteArray& line, output) {
if (line.startsWith('V')) {