diff options
author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-10-10 14:00:44 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-10 16:04:07 +0200 |
commit | 8c538d10da618add00aba1acbc8d8dc2f24445b4 (patch) | |
tree | 6832a812165326b250bf2100f45baa7a5a225426 /src/plugins/platforms/ios/qiosclipboard.mm | |
parent | 9bbf08fcf3ad141b92dda3af2103dac28ff40f00 (diff) |
OS X: rename special menu items instead of duplicating
Two-part fix: QCocoaMenu::syncMenuItem, when selecting the "old" menu,
if an item was merged, 'applicationMenu' was always selected, but this
is wrong for any item with a role >= CutRole (such an item still can
be "merged", but it's not in the application menu).
QCocoaMenuItem::sync - item can be merged with itself: after item's
role detected, the search for an item to merge with can find exactly
the same item we've just detected the role for (since a data-member is
modified) - try to avoid this.
Task-number: QTBUG-39934
Change-Id: Ibe1df9e92973380652101143067e14922afdfb9e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qiosclipboard.mm')
0 files changed, 0 insertions, 0 deletions