From 5f71203dd0129de76220f7a3198111a0d2186667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Thu, 3 Jan 2013 09:38:10 +0100
Subject: Cocoa: export setDockMenu

Change-Id: I1eb35c34427660d2662f310a3e8c4e5ba42e08eb
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/plugins/platforms/cocoa/qcocoanativeinterface.h  |  4 ++++
 src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
index 34e8fb61e2..592ede4617 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 class QPlatformPrinterSupport;
 class QPrintEngine;
+class QPlatformMenu;
 
 class QCocoaNativeInterface : public QPlatformNativeInterface
 {
@@ -92,6 +93,9 @@ private:
     static void addToMimeList(void *macPasteboardMime);
     static void removeFromMimeList(void *macPasteboardMime);
     static void registerDraggedTypes(const QStringList &types);
+
+    // Dock menu support
+    static void setDockMenu(QPlatformMenu *platformMenu);
 };
 
 #endif // QCOCOANATIVEINTERFACE_H
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index 08084b5200..14bb82bc7e 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -42,6 +42,7 @@
 #include "qcocoanativeinterface.h"
 #include "qcocoaglcontext.h"
 #include "qcocoawindow.h"
+#include "qcocoamenu.h"
 #include "qcocoamenubar.h"
 #include "qmacmime.h"
 
@@ -60,6 +61,8 @@
 #include <qpa/qplatformprintersupport.h>
 #endif
 
+#include <Cocoa/Cocoa.h>
+
 QT_BEGIN_NAMESPACE
 
 QCocoaNativeInterface::QCocoaNativeInterface()
@@ -103,6 +106,8 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::removeFromMimeList);
     if (resource.toLower() == "registerdraggedtypes")
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerDraggedTypes);
+    if (resource.toLower() == "setdockmenu")
+        return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setDockMenu);
 
     return 0;
 }
@@ -170,4 +175,12 @@ void QCocoaNativeInterface::registerDraggedTypes(const QStringList &types)
     qt_mac_registerDraggedTypes(types);
 }
 
+void QCocoaNativeInterface::setDockMenu(QPlatformMenu *platformMenu)
+{
+    QCocoaMenu *cocoaPlatformMenu = static_cast<QCocoaMenu *>(platformMenu);
+    NSMenu *menu = cocoaPlatformMenu->nsMenu();
+    // setDockMenu seems to be undocumented, but this is what Qt 4 did.
+    [NSApp setDockMenu: menu];
+}
+
 QT_END_NAMESPACE
-- 
cgit v1.2.3