From 52c5d2248f4602c45fe33d489cc91ab41531d78f Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Wed, 3 Aug 2022 21:22:51 +0200 Subject: [PATCH] Fix nativeEventFilter signature when building against Qt6 --- framebuffers/xcb/xcb_framebuffer.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/framebuffers/xcb/xcb_framebuffer.cpp b/framebuffers/xcb/xcb_framebuffer.cpp index 313420b8..bf036021 100644 --- a/framebuffers/xcb/xcb_framebuffer.cpp +++ b/framebuffers/xcb/xcb_framebuffer.cpp @@ -35,7 +35,11 @@ public: KrfbXCBEventFilter(XCBFrameBuffer *owner); public: +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#endif public: int xdamageBaseEvent; @@ -102,7 +106,11 @@ KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner): bool KrfbXCBEventFilter::nativeEventFilter(const QByteArray &eventType, +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void *message, long *result) { +#else + void *message, qintptr *result) { +#endif Q_UNUSED(result); // "result" is only used on windows if (xdamageBaseEvent == 0) return false; // no xdamage extension