diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-24 17:46:24 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-04-12 19:30:12 +0000 |
| commit | 2bdaf28034541cd57b0aa7c067fda8cfbffa0e94 (patch) | |
| tree | ea569edcaf90ff738e6638808d4577e0fc612f0f /mkspecs/common | |
| parent | fc0255ddc946901b45d4edae662ae213ef85fa9f (diff) | |
Don't disable menu items that belong to the active modal window
A popup/context menu created via QQuickPlatformMenu doesn't belong to any
menubar, so by disabling items in a menu that doesn't belong to the currently
active menubar (5b9f6862b1), we disabled all menu items in a QQuickPlatformMenu
when a modal window was active.
For such unrooted menus, use the QCocoaMenuObject data structure to record
which window it is shown for, and only disable items if that window is not
also the current modal window.
Amends 5b9f6862b1aa474a392203c69f6db678d633cecf.
Fixes: QTBUG-92040
Pick-to: 6.1 6.0 5.15
Change-Id: I56b6d579e5e94689b43ca84d4637e35dc2cbeb4c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'mkspecs/common')
0 files changed, 0 insertions, 0 deletions