Cocoa: Load the standard app menu.
authorMorten Sorvig <morten.sorvig@nokia.com>
Mon, 22 Aug 2011 11:43:42 +0000 (13:43 +0200)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>
Mon, 29 Aug 2011 11:14:26 +0000 (13:14 +0200)
commit12b55d9631988bbd40498c725d635febcb73beb8
treed5cc473667de4430211a59eea26eaed1076e4465
parent81c84b8649d483145e3397d3e34df608e704d108
Cocoa: Load the standard app menu.

It's now possible to quit and hide the app window
using the keyboard shortcuts.

The menu nib files are now stored in Qt resources,
written to QDir::temp at app startup and loaded
from there. This will simplify deployment compared
with Qt 4 where the nibs had to be copied into the
QtGui framework when deploying the app.

This change also moves the mac resources
(qt_menu.nib, cursors) from widgets to the cocoa
plugin.

Change-Id: If1d6fd353369ea4e89a9e35579906a2de7298fa2
Reviewed-on: http://codereview.qt.nokia.com/3314
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
16 files changed:
src/plugins/platforms/cocoa/cocoa.pro
src/plugins/platforms/cocoa/images/copyarrowcursor.png [moved from src/widgets/mac/images/copyarrowcursor.png with 100% similarity]
src/plugins/platforms/cocoa/images/forbiddencursor.png [moved from src/widgets/mac/images/forbiddencursor.png with 100% similarity]
src/plugins/platforms/cocoa/images/leopard-unified-toolbar-on.png [moved from src/widgets/mac/images/leopard-unified-toolbar-on.png with 100% similarity]
src/plugins/platforms/cocoa/images/pluscursor.png [moved from src/widgets/mac/images/pluscursor.png with 100% similarity]
src/plugins/platforms/cocoa/images/spincursor.png [moved from src/widgets/mac/images/spincursor.png with 100% similarity]
src/plugins/platforms/cocoa/images/waitcursor.png [moved from src/widgets/mac/images/waitcursor.png with 100% similarity]
src/plugins/platforms/cocoa/qcocoaintegration.mm
src/plugins/platforms/cocoa/qcocoamenuloader.h [new file with mode: 0644]
src/plugins/platforms/cocoa/qcocoamenuloader.mm [new file with mode: 0644]
src/plugins/platforms/cocoa/qcocoaresources.qrc [moved from src/widgets/mac/macresources.qrc with 70% similarity]
src/plugins/platforms/cocoa/qt_menu.nib/classes.nib [moved from src/widgets/mac/qt_menu.nib/classes.nib with 100% similarity]
src/plugins/platforms/cocoa/qt_menu.nib/info.nib [moved from src/widgets/mac/qt_menu.nib/info.nib with 100% similarity]
src/plugins/platforms/cocoa/qt_menu.nib/keyedobjects.nib [moved from src/widgets/mac/qt_menu.nib/keyedobjects.nib with 100% similarity]
src/widgets/kernel/kernel.pri
src/widgets/widgets/widgets.pri