diff options
Diffstat (limited to 'tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp')
-rw-r--r-- | tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp index 0969cecc45..8eef99ff38 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.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 <QComboBox> @@ -35,13 +10,13 @@ #include <QWizard> #include <QWizardPage> -#include <QtTest/QtTest> +#include <QTest> class taskQTBUG_25691 : public QWizard { Q_OBJECT public: - taskQTBUG_25691( QWidget * parent = 0 ); + taskQTBUG_25691( QWidget * parent = nullptr ); ~taskQTBUG_25691(void); }; @@ -50,7 +25,7 @@ class taskQTBUG_25691Page1 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page1( QWidget * parent = 0 ); + taskQTBUG_25691Page1( QWidget * parent = nullptr ); ~taskQTBUG_25691Page1(void); }; @@ -59,9 +34,9 @@ class taskQTBUG_25691Page2 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page2( QWidget * parent = 0 ); + taskQTBUG_25691Page2( QWidget * parent = nullptr ); - virtual void initializePage(void); + virtual void initializePage(void) override; ~taskQTBUG_25691Page2(void); |