diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-04-24 14:00:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-25 17:56:26 +0200 |
| commit | 220b2b92b62fb6c45a31e2a8f80e26f115166137 (patch) | |
| tree | 919c242e8addc455a2bde20df408e15582406bf5 /src/plugins/platforms/cocoa/qcocoamenu.h | |
| parent | 370e89f06465a4d61c7b72291115cd7b5a0d576a (diff) | |
Cocoa: Improve text heuristic menu item syncing logic
Don't try anything after the original syncing, particularly after
changing the menu item's text. Also, don't try anything if the menu
item cannot be linked up to a menubar (see QTBUG-30756). This latter
point requires extra syncing after adding a menu in the menubar.
Finally, to be able to find the menubar, we need to clean the code for
moc's eyes.
Task-number: QTBUG-30756
Task-number: QTBUG-30812
Change-Id: I88fad663f1c35d03a0cb167d1723d16f590918c0
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h index 65f31a33c2..9100b9b15f 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.h +++ b/src/plugins/platforms/cocoa/qcocoamenu.h @@ -47,10 +47,6 @@ #include <qpa/qplatformmenu.h> #include "qcocoamenuitem.h" -@class NSMenuItem; -@class NSMenu; -@class NSObject; - QT_BEGIN_NAMESPACE class QCocoaMenu : public QPlatformMenu @@ -89,6 +85,7 @@ public: virtual QPlatformMenuItem *menuItemAt(int position) const; virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const; + QList<QCocoaMenuItem *> items() const; QList<QCocoaMenuItem *> merged() const; private: QCocoaMenuItem *itemOrNull(int index) const; |