diff --git a/shell/primaryoutputwatcher.cpp b/shell/primaryoutputwatcher.cpp index 0b13e2575..993069252 100644 --- a/shell/primaryoutputwatcher.cpp +++ b/shell/primaryoutputwatcher.cpp @@ -108,7 +108,11 @@ void PrimaryOutputWatcher::setupRegistry() m_registry->setup(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) bool PrimaryOutputWatcher::nativeEventFilter(const QByteArray &eventType, void *message, long int *result) +#else +bool PrimaryOutputWatcher::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) +#endif { Q_UNUSED(result); #if HAVE_X11 diff --git a/shell/primaryoutputwatcher.h b/shell/primaryoutputwatcher.h index bbfffce57..29cf1ecfd 100644 --- a/shell/primaryoutputwatcher.h +++ b/shell/primaryoutputwatcher.h @@ -38,7 +38,11 @@ protected: private: void setupRegistry(); +#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 // All QString m_primaryOutputName; diff --git a/xembed-sni-proxy/fdoselectionmanager.cpp b/xembed-sni-proxy/fdoselectionmanager.cpp index 495b88014..14c89b397 100644 --- a/xembed-sni-proxy/fdoselectionmanager.cpp +++ b/xembed-sni-proxy/fdoselectionmanager.cpp @@ -100,7 +100,11 @@ bool FdoSelectionManager::addDamageWatch(xcb_window_t client) return true; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) bool FdoSelectionManager::nativeEventFilter(const QByteArray &eventType, void *message, long int *result) +#else +bool FdoSelectionManager::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) +#endif { Q_UNUSED(result) diff --git a/xembed-sni-proxy/fdoselectionmanager.h b/xembed-sni-proxy/fdoselectionmanager.h index 16695e2d3..2f3d8bc4c 100644 --- a/xembed-sni-proxy/fdoselectionmanager.h +++ b/xembed-sni-proxy/fdoselectionmanager.h @@ -25,7 +25,11 @@ public: ~FdoSelectionManager() override; protected: +#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 private Q_SLOTS: void onClaimedOwnership();