diff options
Diffstat (limited to 'tests/auto/tools/qmakelib/tst_qmakelib.h')
| -rw-r--r-- | tests/auto/tools/qmakelib/tst_qmakelib.h | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/tests/auto/tools/qmakelib/tst_qmakelib.h b/tests/auto/tools/qmakelib/tst_qmakelib.h index b4a4d95b6f..2573dd27f4 100644 --- a/tests/auto/tools/qmakelib/tst_qmakelib.h +++ b/tests/auto/tools/qmakelib/tst_qmakelib.h @@ -1,36 +1,11 @@ -/**************************************************************************** -** -** 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 <qmakeevaluator.h> #include <QObject> #include <QProcessEnvironment> -#include <QtTest/QtTest> +#include <QTest> class tst_qmakelib : public QObject { @@ -87,14 +62,14 @@ private: class QMakeTestHandler : public QMakeHandler { public: QMakeTestHandler() : QMakeHandler(), printed(false) {} - virtual void message(int type, const QString &msg, const QString &fileName, int lineNo) + virtual void message(int type, const QString &msg, const QString &fileName, int lineNo) override { print(fileName, lineNo, type, msg); } - virtual void fileMessage(int type, const QString &msg) + virtual void fileMessage(int type, const QString &msg) override { Q_UNUSED(type); doPrint(msg); } - virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {} - virtual void doneWithEval(ProFile *) {} + virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) override {} + virtual void doneWithEval(ProFile *) override {} void setExpectedMessages(const QStringList &msgs) { expected = msgs; } QStringList expectedMessages() const { return expected; } |