diff --git a/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp b/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp index bb8bea404d..e7a7162384 100644 --- a/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp +++ b/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp @@ -126,7 +126,11 @@ CompositorDCompositionAcrylicSurface::~CompositorDCompositionAcrylicSurface() DestroyWindow(m_dummyWindow); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &, void *message, qintptr *) +#else bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &, void *message, long *) +#endif { MSG* msg = static_cast( message ); diff --git a/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp b/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp index 26b9927176..87288c71e6 100644 --- a/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp +++ b/modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp @@ -175,7 +175,11 @@ public: ~CompositorDCompositionAcrylicSurface(); protected: +#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: bool init(ID3D11Device *device); diff --git a/modules/gui/qt/maininterface/compositor_win7.cpp b/modules/gui/qt/maininterface/compositor_win7.cpp index 4c7f472a5f..aa809f57ae 100644 --- a/modules/gui/qt/maininterface/compositor_win7.cpp +++ b/modules/gui/qt/maininterface/compositor_win7.cpp @@ -287,7 +287,11 @@ Win7NativeEventFilter::Win7NativeEventFilter(QObject* parent) } //parse native events that are not reported by Qt +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool Win7NativeEventFilter::nativeEventFilter(const QByteArray&, void* message, qintptr*) +#else bool Win7NativeEventFilter::nativeEventFilter(const QByteArray&, void* message, long*) +#endif { MSG * msg = static_cast( message ); diff --git a/modules/gui/qt/maininterface/compositor_win7.hpp b/modules/gui/qt/maininterface/compositor_win7.hpp index 06ebed9ae5..094e35c75c 100644 --- a/modules/gui/qt/maininterface/compositor_win7.hpp +++ b/modules/gui/qt/maininterface/compositor_win7.hpp @@ -34,7 +34,11 @@ class Win7NativeEventFilter : public QObject, public QAbstractNativeEventFilter public: Win7NativeEventFilter( QObject* parent = nullptr ); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */); +#else bool nativeEventFilter(const QByteArray &, void *message, long* /* result */); +#endif signals: void windowStyleChanged(); }; diff --git a/modules/gui/qt/maininterface/mainctx_win32.cpp b/modules/gui/qt/maininterface/mainctx_win32.cpp index b435ad8afa..2579f79856 100644 --- a/modules/gui/qt/maininterface/mainctx_win32.cpp +++ b/modules/gui/qt/maininterface/mainctx_win32.cpp @@ -246,7 +246,11 @@ public: return qRound(static_cast(8) * window->devicePixelRatio()); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &, void *message, qintptr *result) override +#else bool nativeEventFilter(const QByteArray &, void *message, long *result) override +#endif { MSG* msg = static_cast( message ); @@ -665,7 +669,11 @@ void WinTaskbarWidget::createTaskBarButtons() changeThumbbarButtons( THEMIM->getPlayingState() ); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */) +#else bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, long* /* result */) +#endif { MSG * msg = static_cast( message ); if (msg->hwnd != WinId(m_window)) @@ -905,7 +913,11 @@ bool InterfaceWindowHandlerWin32::eventFilter(QObject* obj, QEvent* ev) return ret; } -bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, long *result) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, qintptr *result) +#else + bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, long *result) +#endif { MSG* msg = static_cast( message ); diff --git a/modules/gui/qt/maininterface/mainctx_win32.hpp b/modules/gui/qt/maininterface/mainctx_win32.hpp index 8a33a82b7d..256c7a93db 100644 --- a/modules/gui/qt/maininterface/mainctx_win32.hpp +++ b/modules/gui/qt/maininterface/mainctx_win32.hpp @@ -36,7 +36,11 @@ public: virtual ~WinTaskbarWidget(); private: +#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 void createTaskBarButtons(); private slots: @@ -77,7 +81,11 @@ public: bool eventFilter(QObject*, QEvent* event) override; protected: +#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: #if QT_CLIENT_SIDE_DECORATION_AVAILABLE diff --git a/modules/gui/qt/style/windowsthemeprovider.cpp b/modules/gui/qt/style/windowsthemeprovider.cpp index 755623131e..edbc62eba7 100644 --- a/modules/gui/qt/style/windowsthemeprovider.cpp +++ b/modules/gui/qt/style/windowsthemeprovider.cpp @@ -50,7 +50,11 @@ public: return !m_settings.value(WIN_THEME_SETTING_LIGHT_THEME_KEY).toBool(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &, void *message, qintptr *) +#else bool nativeEventFilter(const QByteArray &, void *message, long *) +#endif { MSG* msg = static_cast( message ); if ( msg->message == WM_SETTINGCHANGE