diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 18:07:03 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-12 18:57:24 +0000 |
| commit | f59e2fe84982329bff6dc6df37fef0c3f81437b6 (patch) | |
| tree | ce90c8b6d895511fd21ac4f334dcc7a763a97d90 /tools | |
| parent | 3c5f39b1ec622fbcc3ab5c8d0c1912f040bf8d14 (diff) | |
add /nologo to jom calls as well
Change-Id: I7de0483ae17377d6682a4279ff3914aa78fc11a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f326cbc08a..81be286a7c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3181,7 +3181,7 @@ void Configure::detectArch() // compile command = dictionary[ "MAKE" ]; - if (command.contains("nmake")) + if (command.contains("nmake") || command.contains("jom")) command += " /NOLOGO"; command += " -s"; Environment::execute(command); @@ -3286,7 +3286,7 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext if (code == 0) { // compile command = dictionary[ "MAKE" ]; - if (command.contains("nmake")) + if (command.contains("nmake") || command.contains("jom")) command += " /NOLOGO"; command += " -s 2>&1"; output = Environment::execute(command, &code); |