diff options
Diffstat (limited to 'tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp | 59 |
1 files changed, 18 insertions, 41 deletions
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp index e3f4720a5e..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 @@ -39,18 +18,16 @@ public: TestEventDispatcher(QObject* parent =0) : QAbstractEventDispatcher(parent) {} - void flush() {} - bool hasPendingEvents() { return false; } - void interrupt() {} - bool processEvents(QEventLoop::ProcessEventsFlags) { return false; } - void registerSocketNotifier(QSocketNotifier*) {} - void registerTimer(int,int,Qt::TimerType,QObject*) {} - QList<TimerInfo> registeredTimers(QObject*) const { return QList<TimerInfo>(); } - void unregisterSocketNotifier(QSocketNotifier*) {} - bool unregisterTimer(int) { return false; } - bool unregisterTimers(QObject*) { return false; } - int remainingTime(int) { return 0; } - void wakeUp() {} + void interrupt() override {} + bool processEvents(QEventLoop::ProcessEventsFlags) override { return false; } + void registerSocketNotifier(QSocketNotifier*) 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; } + bool unregisterTimers(QObject*) override { return false; } + int remainingTime(int) override { return 0; } + void wakeUp() override {} #ifdef Q_OS_WIN bool registerEventNotifier(QWinEventNotifier *) { return false; } @@ -96,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; |