diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-06 10:43:54 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-09 09:42:22 +0200 |
| commit | 64ddd6a4f57f4579bfd0eab91dc0f433c3a9f5f2 (patch) | |
| tree | 2e656a4776baecfed59bf585138b9b5753d80d2e /src/plugins/qnx/mediaplayer | |
| parent | 89af8871c653197d91541858013d08b8e7cbf751 (diff) | |
Adjust usage of nativeEventFilter for Qt6wip/cmake
Change-Id: Ifea48894e96f1e3f1df53650b3b07cce18a30aea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/qnx/mediaplayer')
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp index c050c03c5..29fd082d8 100644 --- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp @@ -113,9 +113,11 @@ void MmrEventMediaPlayerControl::resetMonitoring() m_speed = 0; } -bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, - void *message, - long *result) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) +#else +bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, long *result) +#endif { Q_UNUSED(result) if (eventType == "screen_event_t") { 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(); |