1 files changed, 10 insertions, 29 deletions
diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h
index 50232669c0..900f05b87a 100644
--- a/tests/auto/tools/qmake/testcompiler.h
+++ b/tests/auto/tools/qmake/testcompiler.h
@@ -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
 #ifndef TESTCOMPILER_H
 #define TESTCOMPILER_H
 
@@ -60,6 +35,8 @@ public:
     // executes a qmake on proName in the specified workDir, output goes to buildDir or workDir if it's null
     bool qmake(const QString &workDir, const QString &proName, const QString &buildDir = QString(),
                const QStringList &additionalArguments = QStringList());
+    // executes qmake in workDir with the specified arguments
+    bool qmake(const QString &workDir, const QStringList &arguments);
     // executes a make in the specified workPath, with an optional target (eg. install)
     bool make( const QString &workPath, const QString &target = QString(), bool expectFail = false );
     // checks if the executable exists in destDir
@@ -71,13 +48,17 @@ public:
     bool removeProject( const QString &workPath, const QString &project );
     // removes the file specified by 'fileName' on the 'workPath'
     bool removeFile( const QString &workPath, const QString &fileName );
-    // returns each line of stdout of the last command append with a "new line" character(s) to suit the platform
+
+    // Returns each line of stdout/stderr of the last commands
+    // separated by platform-specific line endings.
     QString commandOutput() const;
+
     // clear the results of storage of stdout for running previous commands
     void clearCommandOutput();
 
-private:
     bool runCommand(const QString &cmd, const QStringList &args, bool expectFail = false);
+
+private:
     bool errorOut();
 
     QString makeCmd_;