1 files changed, 23 insertions, 36 deletions

diff --git a/tests/auto/tools/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp
index 0a7ba3b40b..23d9b76187 100644
--- a/tests/auto/tools/qmake/testcompiler.cpp
+++ b/tests/auto/tools/qmake/testcompiler.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "testcompiler.h"
 
@@ -129,7 +104,8 @@ static inline QStringList systemEnvironment()
 #ifdef Q_OS_WIN
     static QStringList result;
     if (result.isEmpty()) {
-        foreach (const QString &variable, QProcess::systemEnvironment()) {
+        const auto env = QProcess::systemEnvironment();
+        for (const QString &variable : env) {
             if (variable.startsWith(QStringLiteral("MAKEFLAGS="), Qt::CaseInsensitive)) {
                 qWarning("Removing environment setting '%s'", qPrintable(variable));
             } else {
@@ -148,7 +124,7 @@ bool TestCompiler::runCommand(const QString &cmd, const QStringList &args, bool
     QString dbg = cmd;
     if (dbg.contains(' '))
         dbg.prepend('"').append('"');
-    foreach (QString arg, args) {
+    for (QString arg : args) {
         if (arg.contains(' '))
             arg.prepend('"').append('"');
         dbg.append(' ').append(arg);
@@ -164,15 +140,17 @@ bool TestCompiler::runCommand(const QString &cmd, const QStringList &args, bool
         return errorOut();
     }
 
-    child.setReadChannel(QProcess::StandardError);
     child.waitForFinished(-1);
     bool ok = child.exitStatus() == QProcess::NormalExit && (expectFail ^ (child.exitCode() == 0));
 
-    foreach (const QByteArray &output, child.readAllStandardError().split('\n')) {
-        testOutput_.append(QString::fromLocal8Bit(output));
-
-        if (output.startsWith("Project MESSAGE: FAILED"))
-            ok = false;
+    for (auto channel : { QProcess::StandardOutput, QProcess::StandardError }) {
+        child.setReadChannel(channel);
+        while (!child.atEnd()) {
+            const QString output = QString::fromLocal8Bit(child.readLine());
+            if (output.startsWith("Project MESSAGE: FAILED"))
+                ok = false;
+            testOutput_.append(output);
+        }
     }
 
     return ok ? true : errorOut();
@@ -279,14 +257,23 @@ bool TestCompiler::qmake(const QString &workDir, const QString &proName, const Q
                       << additionalArguments);
 }
 
+bool TestCompiler::qmake(const QString &workDir, const QStringList &arguments)
+{
+    QDir d;
+    d.setCurrent(workDir); // ### runCommand should take a workingDir argument instead
+    return runCommand(qmakeCmd_, arguments);
+}
+
 bool TestCompiler::make( const QString &workPath, const QString &target, bool expectFail )
 {
     QDir D;
     D.setCurrent( workPath );
 
     QStringList args = makeArgs_;
-    if (makeCmd_.contains("nmake", Qt::CaseInsensitive))
+    if (makeCmd_.contains("nmake", Qt::CaseInsensitive) ||
+        makeCmd_.contains("jom", Qt::CaseInsensitive)) {
         args << "/NOLOGO";
+    }
     if (!target.isEmpty())
         args << target;