diff options
Diffstat (limited to 'tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp | 50 |
1 files changed, 12 insertions, 38 deletions
diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp index f71bf59738..35ba5e5309 100644 --- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp +++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp @@ -1,55 +1,29 @@ -/**************************************************************************** -** -** 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 <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 +class TestEventDispatcher : public QAbstractEventDispatcherV2 { Q_OBJECT public: - TestEventDispatcher(QObject* parent =0) - : QAbstractEventDispatcher(parent) - {} 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 registerTimer(Qt::TimerId,Duration,Qt::TimerType,QObject*) override {} + QList<TimerInfoV2> timersForObject(QObject*) const override { return {}; } void unregisterSocketNotifier(QSocketNotifier*) override {} - bool unregisterTimer(int) override { return false; } + bool unregisterTimer(Qt::TimerId) override { return false; } bool unregisterTimers(QObject*) override { return false; } - int remainingTime(int) override { return 0; } + Duration remainingTime(Qt::TimerId) const override { return {}; } void wakeUp() override {} #ifdef Q_OS_WIN @@ -94,7 +68,7 @@ int main(int argc, char** argv) /* Run with no special arguments. */ { tst_BenchlibOptions test; - ret += QTest::qExec(&test, args.size(), const_cast<char**>(&args[0])); + ret += QTest::qExec(&test, int(args.size()), const_cast<char**>(&args[0])); } /* Run with an exact number of iterations. */ @@ -103,7 +77,7 @@ int main(int argc, char** argv) extraArgs.push_back("-iterations"); extraArgs.push_back("15"); tst_BenchlibFifteenIterations test; - ret += QTest::qExec(&test, extraArgs.size(), const_cast<char**>(&extraArgs[0])); + ret += QTest::qExec(&test, int(extraArgs.size()), const_cast<char**>(&extraArgs[0])); } /* @@ -114,7 +88,7 @@ int main(int argc, char** argv) extraArgs.push_back("-minimumvalue"); extraArgs.push_back("100"); tst_BenchlibOneHundredMinimum test; - ret += QTest::qExec(&test, extraArgs.size(), const_cast<char**>(&extraArgs[0])); + ret += QTest::qExec(&test, int(extraArgs.size()), const_cast<char**>(&extraArgs[0])); } return ret; |