diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qprogressbar')
4 files changed, 22 insertions, 41 deletions
diff --git a/tests/auto/widgets/widgets/qprogressbar/BLACKLIST b/tests/auto/widgets/widgets/qprogressbar/BLACKLIST new file mode 100644 index 0000000000..fa25ef97a5 --- /dev/null +++ b/tests/auto/widgets/widgets/qprogressbar/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87425 +[setMinMaxRepaint] +android diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt index 34131ba34e..61ce6c2692 100644 --- a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt @@ -1,13 +1,21 @@ -# Generated from qprogressbar.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qprogressbar Test: ##################################################################### -qt_add_test(tst_qprogressbar +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qprogressbar LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_qprogressbar SOURCES tst_qprogressbar.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate ) diff --git a/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro b/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro deleted file mode 100644 index 1de3e6309f..0000000000 --- a/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qprogressbar -QT += widgets testlib -SOURCES += tst_qprogressbar.cpp - - - diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp index eb80460311..4a90ed6667 100644 --- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.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 "qprogressbar.h" #include <qlocale.h> #include <qapplication.h> @@ -36,6 +11,8 @@ #include <qtimer.h> #include <QStyleFactory> +#include <QtWidgets/private/qapplication_p.h> + class tst_QProgressBar : public QObject { Q_OBJECT @@ -248,7 +225,7 @@ void tst_QProgressBar::setMinMaxRepaint() pbar.setFormat("%v"); pbar.move(300, 300); pbar.show(); - qApp->setActiveWindow(&pbar); + QApplicationPrivate::setActiveWindow(&pbar); QVERIFY(QTest::qWaitForWindowActive(&pbar)); // No repaint when setting minimum to the current minimum |