Skip to content

Commit 80761af

Browse files
committed
qt6: Handle different signatures of QANEF::nativeEventFilter
This change ensures compatibility across all supported Qt versions.
1 parent 51c6981 commit 80761af

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/qt/winshutdownmonitor.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212

1313
// If we don't want a message to be processed by Qt, return true and set result to
1414
// the value that the window procedure should return. Otherwise return false.
15+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
16+
bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr *pnResult)
17+
#else
1518
bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pnResult)
19+
#endif
1620
{
1721
Q_UNUSED(eventType);
1822

src/qt/winshutdownmonitor.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ class WinShutdownMonitor : public QAbstractNativeEventFilter
2020
WinShutdownMonitor(std::function<void()> shutdown_fn) : m_shutdown_fn{std::move(shutdown_fn)} {}
2121

2222
/** Implements QAbstractNativeEventFilter interface for processing Windows messages */
23+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
24+
bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr *pnResult) override;
25+
#else
2326
bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pnResult) override;
27+
#endif
2428

2529
/** Register the reason for blocking shutdown on Windows to allow clean client exit */
2630
static void registerShutdownBlockReason(const QString& strReason, const HWND& mainWinId);

0 commit comments

Comments
 (0)