From 64ddd6a4f57f4579bfd0eab91dc0f433c3a9f5f2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 6 Sep 2019 10:43:54 +0200 Subject: Adjust usage of nativeEventFilter for Qt6 Change-Id: Ifea48894e96f1e3f1df53650b3b07cce18a30aea Reviewed-by: Qt CI Bot Reviewed-by: Simon Hausmann --- src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h') diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h index 0e4defc5c..cb80ccbfc 100644 --- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h +++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h @@ -58,9 +58,11 @@ public: void stopMonitoring() override; void resetMonitoring() override; - bool nativeEventFilter(const QByteArray &eventType, - void *message, - long *result) 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 private Q_SLOTS: void readEvents(); -- cgit v1.2.3