Cocoa implementation of QPA menu interface.
authorJames Turner <james.turner@kdab.com>
Fri, 4 May 2012 13:16:05 +0000 (14:16 +0100)
committerQt by Nokia <qt-info@nokia.com>
Sat, 19 May 2012 08:18:21 +0000 (10:18 +0200)
commitb8246f08e49eb672974fd3d3d972a5ff13c1524d
tree509ab759670f0b24aa8d44ced0584fc2832f5e76
parent899f1d35a435fd499c73b29aabb6a609d496e5ed
Cocoa implementation of QPA menu interface.

Implement the QPA platform menu interface for Cocoa,
including native menubar support and merging with the
predefined menus created from the bundled .nib. Cleanup
code previously used to maintain the menus, and add
a manual test of the menus code.

Change-Id: Ia99267ddb6485e18e05c540eb32c5aee6cbb85db
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
22 files changed:
src/plugins/platforms/cocoa/cocoa.pro
src/plugins/platforms/cocoa/qcocoaapplication.mm
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
src/plugins/platforms/cocoa/qcocoahelpers.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoamenubar.h [new file with mode: 0644]
src/plugins/platforms/cocoa/qcocoamenubar.mm [new file with mode: 0644]
src/plugins/platforms/cocoa/qcocoamenuitem.h [new file with mode: 0644]
src/plugins/platforms/cocoa/qcocoamenuitem.mm [new file with mode: 0644]
src/plugins/platforms/cocoa/qcocoamenuloader.h
src/plugins/platforms/cocoa/qcocoamenuloader.mm
src/plugins/platforms/cocoa/qcocoanativeinterface.h
src/plugins/platforms/cocoa/qcocoanativeinterface.mm
src/plugins/platforms/cocoa/qcocoatheme.h
src/plugins/platforms/cocoa/qcocoatheme.mm
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qt_menu.nib/classes.nib
tests/manual/cocoa/menus/main.cpp [new file with mode: 0644]
tests/manual/cocoa/menus/menus.pro [new file with mode: 0644]