diff options
Diffstat (limited to 'tests/auto/tools/qmake/tst_qmake.cpp')
| -rw-r--r-- | tests/auto/tools/qmake/tst_qmake.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp index ca4c11e9aa..6e2eb316b9 100644 --- a/tests/auto/tools/qmake/tst_qmake.cpp +++ b/tests/auto/tools/qmake/tst_qmake.cpp @@ -44,6 +44,7 @@ #include "testcompiler.h" #include <QObject> +#include <QStandardPaths> #include <QDir> class tst_qmake : public QObject @@ -111,7 +112,12 @@ void tst_qmake::initTestCase() QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath); QString cmd = QString("%1/qmake").arg(binpath); #ifdef Q_CC_MSVC - test_compiler.setBaseCommands( "nmake", cmd ); + const QString jom = QStandardPaths::findExecutable(QLatin1String("jom.exe")); + if (jom.isEmpty()) { + test_compiler.setBaseCommands( QLatin1String("nmake"), cmd ); + } else { + test_compiler.setBaseCommands( jom, cmd ); + } #elif defined(Q_CC_MINGW) test_compiler.setBaseCommands( "mingw32-make", cmd ); #elif defined(Q_OS_WIN) && defined(Q_CC_GNU) |