From 5910dd7fe0018dbc87a01400d9a1740a1e650acf Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Tue, 2 Jul 2024 21:05:00 +0200 Subject: [PATCH] Testlib: remove no longer used function call QBenchmarkEvent::nativeEventFilter() was changed with Qt6 but the old Qt5 version was still there and no longer used. Pick-to: 6.7 6.5 Change-Id: Ia740ce0dc743666c9b3bcbe12d1d310fb9ffcd7b Reviewed-by: Fabian Kosmale (cherry picked from commit ef215fdd8bd36c0312d657e0aafaa766d7c297f7) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qbenchmarkevent.cpp | 4 ---- src/testlib/qbenchmarkevent_p.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp index 5a895106a22..36ec1dc91ca 100644 --- a/src/testlib/qbenchmarkevent.cpp +++ b/src/testlib/qbenchmarkevent.cpp @@ -45,11 +45,7 @@ int QBenchmarkEvent::adjustMedianCount(int suggestion) } // This could be done in a much better way, this is just the beginning. -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool QBenchmarkEvent::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) -#else -bool QBenchmarkEvent::nativeEventFilter(const QByteArray &eventType, void *message, long *result) -#endif { Q_UNUSED(eventType); Q_UNUSED(message); diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h index 7e997e77793..bd6a48d44dd 100644 --- a/src/testlib/qbenchmarkevent_p.h +++ b/src/testlib/qbenchmarkevent_p.h @@ -32,11 +32,7 @@ public: bool isMeasurementAccepted(Measurement measurement) override; int adjustIterationCount(int suggestion) override; int adjustMedianCount(int suggestion) override; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; -#else - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; -#endif qint64 eventCounter = 0; };