Code polishing, continuing cb23999fbf16476d52678d23fc3cf888090560bf

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.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index dd778dd286..e2ca351419 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -31,6 +31,7 @@
 #include "rvctparser.h"
 
 #include <utils/qtcassert.h>
+#include <utils/synchronousprocess.h>
 
 #include <QtCore/QProcess>
 #include <QtCore/QProcessEnvironment>
@@ -126,7 +127,15 @@ void RVCTToolChain::updateVersion()
         return;
     }
     armcc.closeWriteChannel();
-    armcc.waitForFinished();
+    if (!armcc.waitForFinished()) {
+        Utils::SynchronousProcess::stopProcess(armcc);
+        qWarning("Timeout running rvct binary '%s' trying to determine version.", qPrintable(binary));
+        return;
+    }
+    if (armcc.exitStatus() != QProcess::NormalExit) {
+        qWarning("A crash occurred when running rvct binary '%s' trying to determine version.", qPrintable(binary));
+        return;
+    }
     QString versionLine = QString::fromLocal8Bit(armcc.readAllStandardOutput());
     versionLine += QString::fromLocal8Bit(armcc.readAllStandardError());
     const QRegExp versionRegExp(QLatin1String("RVCT(\\d*)\\.(\\d*).*\\[Build.(\\d*)\\]"),