diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp index 4fd3661fa7..0a1b140867 100644 --- a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp +++ b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp @@ -1,33 +1,8 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> #include <qcoreapplication.h> #include <qdebug.h> @@ -36,6 +11,8 @@ #include <QHBoxLayout> #include <qlineedit.h> +#include <QtWidgets/private/qapplication_p.h> + class tst_QStackedWidget : public QObject { Q_OBJECT @@ -128,13 +105,13 @@ public: createWidgets(); } - virtual void showEvent (QShowEvent *) + virtual void showEvent (QShowEvent *) override { if (!m_staticWidgets) createWidgets(); } - virtual void hideEvent (QHideEvent *) + virtual void hideEvent (QHideEvent *) override { if (!m_staticWidgets) destroyWidgets(); @@ -182,7 +159,7 @@ void tst_QStackedWidget::dynamicPages() le11->setFocus(); // set focus to second widget in the page sw->resize(200, 200); sw->show(); - qApp->setActiveWindow(sw); + QApplicationPrivate::setActiveWindow(sw); QVERIFY(QTest::qWaitForWindowActive(sw)); QTRY_COMPARE(QApplication::focusWidget(), le11); |