1 files changed, 13 insertions, 11 deletions

diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h
index 5e0d706c68..6b06cedd61 100644
--- a/tests/auto/tools/qmake/testcompiler.h
+++ b/tests/auto/tools/qmake/testcompiler.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -49,7 +49,7 @@ public:
     void setBaseCommands( QString makeCmd, QString qmakeCmd );
 
     void resetArguments();
-    void setArguments( QString makeArgs, QString qmakeArgs );
+    void setArguments(const QStringList &makeArgs, const QStringList &qmakeArgs);
 
     void resetEnvironment();
     void addToEnvironment( QString varAssignment );
@@ -78,11 +78,13 @@ public:
     void clearCommandOutput();
 
 private:
-    bool runCommand( QString cmdLine, bool expectFail = false );
+    bool runCommand(const QString &cmd, const QStringList &args, bool expectFail = false);
     bool errorOut();
 
-    QString makeCmd_, makeArgs_;
-    QString qmakeCmd_, qmakeArgs_;
+    QString makeCmd_;
+    QStringList makeArgs_;
+    QString qmakeCmd_;
+    QStringList qmakeArgs_;
     QStringList environment_;
 
     QStringList testOutput_;