diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 12:41:42 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-02 12:41:42 +1000 |
| commit | 662666a5d4d114f91dbed8cbe3ce46fddfe3c82b (patch) | |
| tree | 0b72d67d46bf1693e1b3e2b8669fef8c8c89e766 /src/gui/kernel/qcocoamenuloader_mac_p.h | |
| parent | 35a211cd95e0d09ef0b547b57f01f0a9ff41da2f (diff) | |
| parent | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff) | |
| download | qt4-tools-662666a5d4d114f91dbed8cbe3ce46fddfe3c82b.tar.gz | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/gui/kernel/qcocoamenuloader_mac_p.h')
| -rw-r--r-- | src/gui/kernel/qcocoamenuloader_mac_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/kernel/qcocoamenuloader_mac_p.h index 432a7a6522..81c136eb87 100644 --- a/src/gui/kernel/qcocoamenuloader_mac_p.h +++ b/src/gui/kernel/qcocoamenuloader_mac_p.h @@ -70,6 +70,7 @@ } - (void)ensureAppMenuInMenu:(NSMenu *)menu; +- (void)removeActionsFromAppMenu; - (NSMenu *)applicationMenu; - (NSMenu *)menu; - (NSMenuItem *)quitMenuItem; |