summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsharedpointer/externaltests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qsharedpointer/externaltests.cpp')
-rw-r--r--tests/auto/qsharedpointer/externaltests.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index eb2f27d..7eae3c1 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -671,14 +671,9 @@ namespace QTest {
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) {
@@ -686,7 +681,6 @@ namespace QTest {
if (make.waitForStarted())
break;
}
-#endif
if (make.state() != QProcess::Running) {
exitCode = 255;