--- a/tests/auto/qsharedpointer/externaltests.cpp Wed Jun 23 19:07:03 2010 +0300
+++ b/tests/auto/qsharedpointer/externaltests.cpp Tue Jul 06 15:10:48 2010 +0300
@@ -660,14 +660,9 @@
make.setProcessChannelMode(channelMode);
-#if defined(Q_OS_WIN) && !defined(Q_CC_MINGW)
- make.start(QLatin1String("nmake.exe"), args);
- make.waitForStarted();
-#else
static const char makes[] =
-# ifdef Q_CC_MINGW
- "mingw32-make.exe\0"
-# endif
+ "nmake.exe\0" //for visual c++
+ "mingw32-make.exe\0" //for mingw
"gmake\0"
"make\0";
for (const char *p = makes; *p; p += strlen(p) + 1) {
@@ -675,7 +670,6 @@
if (make.waitForStarted())
break;
}
-#endif
if (make.state() != QProcess::Running) {
exitCode = 255;