diff options
Diffstat (limited to 'tests/auto/testlib/selftests/benchlibeventcounter')
4 files changed, 17 insertions, 62 deletions
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt deleted file mode 100644 index e61fc6f93e..0000000000 --- a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Generated from benchlibeventcounter.pro. - -##################################################################### -## benchlibeventcounter Binary: -##################################################################### - -qt_add_executable(benchlibeventcounter - SOURCES - tst_benchlibeventcounter.cpp - PUBLIC_LIBRARIES - Qt::Test -) - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt index 0b626def35..e91340512b 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt @@ -1,21 +1,21 @@ -# Generated from benchlibeventcounter.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## benchlibeventcounter Binary: ##################################################################### -qt_add_executable(benchlibeventcounter - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case +qt_internal_add_executable(benchlibeventcounter + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_benchlibeventcounter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Test ) ## Scopes: ##################################################################### -# special case begin -qt_apply_testlib_coverage_options(benchlibeventcounter) -# special case end +qt_internal_apply_testlib_coverage_options(benchlibeventcounter) diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro deleted file mode 100644 index 98fa0e4567..0000000000 --- a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES += tst_benchlibeventcounter.cpp -QT = core testlib - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -TARGET = benchlibeventcounter - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp index 224b720f5f..53c8f50ff2 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp +++ b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp @@ -1,34 +1,13 @@ -/**************************************************************************** -** -** 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 <QtCore/QCoreApplication> -#include <QtTest/QtTest> +#include <QTest> +#if defined(Q_OS_WIN32) +#include <QWinEventNotifier> +#endif +#include <QAbstractEventDispatcher> /* Custom event dispatcher to ensure we don't receive any spontaneous events */ class TestEventDispatcher : public QAbstractEventDispatcher @@ -42,7 +21,7 @@ public: void interrupt() override {} bool processEvents(QEventLoop::ProcessEventsFlags) override { return false; } void registerSocketNotifier(QSocketNotifier*) override {} - void registerTimer(int,int,Qt::TimerType,QObject*) override {} + void registerTimer(int,qint64,Qt::TimerType,QObject*) override {} QList<TimerInfo> registeredTimers(QObject*) const override { return QList<TimerInfo>(); } void unregisterSocketNotifier(QSocketNotifier*) override {} bool unregisterTimer(int) override { return false; } @@ -94,7 +73,7 @@ int main(int argc, char** argv) { std::vector<const char*> args(argv, argv + argc); args.push_back("-eventcounter"); - argc = args.size(); + argc = int(args.size()); argv = const_cast<char**>(&args[0]); TestEventDispatcher dispatcher; |