1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Remove QScopedScopeLevelCounter from menu qt_itemFired callback

Browse Source 
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 <fabian.kosmale@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2023-12-14 14:17:00 +01:00
parent a5a082406e
commit fd38df3ec3
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -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);