Skip to content

Commit

Permalink
Merge bitcoin-core/gui#840: qt6: Handle different signatures of `QANE…
Browse files Browse the repository at this point in the history
…F::nativeEventFilter`

80761af qt6: Handle different signatures of `QANEF::nativeEventFilter` (Hennadii Stepanov)

Pull request description:

  Split from bitcoin#30997.

  This PR ensures compatibility across all supported Qt versions.

  For more details, please refer to qt/qtbase@3b38c73.

  No behaviour change.

ACKs for top commit:
  maflcko:
    lgtm ACK 80761af
  promag:
    Code review ACK 80761af.

Tree-SHA512: a265e1c33cc7da37003bb0e6fd40950acb5e948ca9ec63a59a79c5e2a1894334f48d5565539c91d4d777b48a589366958df1498eaa6935e3b7fb534493adb51a
  • Loading branch information
hebasto committed Oct 7, 2024
2 parents ec58dfe + 80761af commit 1b70714
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/qt/winshutdownmonitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@

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

Expand Down
4 changes: 4 additions & 0 deletions src/qt/winshutdownmonitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ class WinShutdownMonitor : public QAbstractNativeEventFilter
WinShutdownMonitor(std::function<void()> shutdown_fn) : m_shutdown_fn{std::move(shutdown_fn)} {}

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

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

0 comments on commit 1b70714

Please sign in to comment.