From fd38df3ec34238d9886be754ae1b5c9e8b10cc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 14 Dec 2023 14:17:00 +0100 Subject: [PATCH] macOS: Remove QScopedScopeLevelCounter from menu qt_itemFired callback The activated signal is delivered as a queued connection, so we're going to raise the scope level as part of notifyInternal2() anyways. In addition, since c5d49725779292a04fed599eb7f508d334ffc5c3 we will automatically raise the level to 1 due to the catch all logic, so in case the connection is changed to direct connection, we'll still raise the scope level as needed. This removes the last remaining QScopedScopeLevelCounter outside of QtCore. Task-number: QTBUG-120124 Change-Id: I91a8ab8c1969d2209657daaca5c232928d1dd985 Reviewed-by: Fabian Kosmale Reviewed-by: Volker Hilsheimer --- src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 581777f2404..2a7e972003f 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm @@ -405,7 +405,6 @@ QT_USE_NAMESPACE if (!platformItem || platformItem->menu()) return; - QScopedScopeLevelCounter scopeLevelCounter(QGuiApplicationPrivate::instance()->threadData.loadRelaxed()); QGuiApplicationPrivate::modifier_buttons = QAppleKeyMapper::fromCocoaModifiers([NSEvent modifierFlags]); static QMetaMethod activatedSignal = QMetaMethod::fromSignal(&QCocoaMenuItem::activated);