1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qmake: Pass /nologo to jom like we do for nmake

Browse Source 
Change-Id: Id9b2ac4dd7d591d471d3e21e8d78d4915620a2c1
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Joerg Bornemann 2019-08-05 11:19:41 +02:00
parent 3ed21726ec
commit 38cfd3a8cb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/tools/qmake/testcompiler.cpp
View File

@ -285,8 +285,10 @@ bool TestCompiler::make( const QString &workPath, const QString &target, bool ex
D.setCurrent( workPath ); D.setCurrent( workPath );
QStringList args = makeArgs_; QStringList args = makeArgs_;
if (makeCmd_.contains("nmake", Qt::CaseInsensitive)) if (makeCmd_.contains("nmake", Qt::CaseInsensitive) ||
makeCmd_.contains("jom", Qt::CaseInsensitive)) {
args << "/NOLOGO"; args << "/NOLOGO";
}
if (!target.isEmpty()) if (!target.isEmpty())
args << target; args << target;