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/common | |
| 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/common')
| -rw-r--r-- | src/plugins/qnx/common/windowgrabber.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/qnx/common/windowgrabber.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp index 9a65ad3a0..f431f98a2 100644 --- a/src/plugins/qnx/common/windowgrabber.cpp +++ b/src/plugins/qnx/common/windowgrabber.cpp @@ -189,7 +189,11 @@ bool WindowGrabber::handleScreenEvent(screen_event_t screen_event) return false; } -bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, long*) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *) +#else +bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, long *) +#endif { if (eventType == "screen_event_t") { const screen_event_t event = static_cast<screen_event_t>(message); diff --git a/src/plugins/qnx/common/windowgrabber.h b/src/plugins/qnx/common/windowgrabber.h index 3ebd0e8a6..5603d9634 100644 --- a/src/plugins/qnx/common/windowgrabber.h +++ b/src/plugins/qnx/common/windowgrabber.h @@ -100,7 +100,11 @@ public: void pause(); void resume(); +#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 bool handleScreenEvent(screen_event_t event); |