From 3cdc9084bae455a09c5dacdcbeb9e9c650516b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 17 Jun 2024 15:35:23 +0200
Subject: [PATCH] Pass on NSNotification to QMacNotificationObserver callbacks
 if supported

Change-Id: I167f2e24453a2f2c75b81207f7293c72243f5a7a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit c7c830057589a91cc369375775d018c5057ba46a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/kernel/qcore_mac_p.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 5ecf8072f46..f5ab2327732 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -336,8 +336,11 @@ public:
     template<typename Functor>
     QMacNotificationObserver(NSObject *object, NSNotificationName name, Functor callback) {
         observer = [[NSNotificationCenter defaultCenter] addObserverForName:name
-            object:object queue:nil usingBlock:^(NSNotification *) {
-                callback();
+            object:object queue:nil usingBlock:^(NSNotification *notification) {
+                if constexpr (std::is_invocable_v<Functor, NSNotification *>)
+                    callback(notification);
+                else
+                    callback();
             }
         ];
     }