2 files changed, 9 insertions, 15 deletions
diff --git a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
index 0cd8acff34..1f6bfa9374 100644
--- a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
@@ -1,15 +1,14 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from benchliboptions.pro.
-
 #####################################################################
 ## benchliboptions Binary:
 #####################################################################
 
 qt_internal_add_executable(benchliboptions
-    NO_INSTALL # special case
-    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    NO_INSTALL
+    EXCEPTIONS
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES
         tst_benchliboptions.cpp
     LIBRARIES
@@ -19,6 +18,4 @@ qt_internal_add_executable(benchliboptions
 ## Scopes:
 #####################################################################
 
-# special case begin
 qt_internal_apply_testlib_coverage_options(tst_selftests)
-# special case end
diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
index b81796e30f..35ba5e5309 100644
--- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
+++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QtCore/QCoreApplication>
@@ -10,23 +10,20 @@
 #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