diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-17 13:47:40 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-17 13:47:40 (GMT) |
| commit | 2136c98b93fe8ea480d6ad34344213635b44039b (patch) | |
| tree | 9bbcd5bbe845360e4adf1c58b833c7d6714cd005 /tests/auto/qsharedpointer | |
| parent | f784f862a0242961d88650dd119becfb1a439072 (diff) | |
| download | Qt-2136c98b93fe8ea480d6ad34344213635b44039b.zip Qt-2136c98b93fe8ea480d6ad34344213635b44039b.tar.gz Qt-2136c98b93fe8ea480d6ad34344213635b44039b.tar.bz2 | |
small simplification of code to run the platform make tool in an autotest
Diffstat (limited to 'tests/auto/qsharedpointer')
| -rw-r--r-- | tests/auto/qsharedpointer/externaltests.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index 3ca70c4..83cbb2a 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; |