summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2011-08-22 13:43:42 +0200
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2011-08-29 13:14:26 +0200
commit12b55d9631988bbd40498c725d635febcb73beb8 (patch)
treed5cc473667de4430211a59eea26eaed1076e4465 /src/widgets/kernel
parent81c84b8649d483145e3397d3e34df608e704d108 (diff)
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>
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r--src/widgets/kernel/kernel.pri1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index 08ec6ac81a..cebd106830 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -211,7 +211,6 @@ qpa {
kernel/qcocoaview_mac.mm \
kernel/qcocoawindow_mac.mm \
kernel/qcocoawindowdelegate_mac.mm \
- kernel/qcocoamenuloader_mac.mm \
kernel/qcocoaapplication_mac.mm \
kernel/qcocoaapplicationdelegate_mac.mm \
kernel/qt_cocoa_helpers_mac.mm \