Respect the PM_SmallIconSize setting for icons in a menu on OS X

When a platform menu is used then it would hard code the icon size to
16x16. Instead of using the hard coded value then PM_SmallIconSize should
be used instead.

Change-Id: I27540ebc4397501e8f57686a118c28cd7167c0a1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
index 4b9a0146a9..d0d1e7e8b8 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
@@ -100,7 +100,8 @@ QCocoaMenuItem::QCocoaMenuItem() :
     m_role(NoRole),
     m_checked(false),
     m_merged(false),
-    m_tag(0)
+    m_tag(0),
+    m_iconSize(16)
 {
 }
 
@@ -332,7 +333,7 @@ NSMenuItem *QCocoaMenuItem::sync()
     NSImage *img = nil;
     if (!m_icon.isNull()) {
         img = qt_mac_create_nsimage(m_icon);
-        [img setSize:NSMakeSize(16, 16)];
+        [img setSize:NSMakeSize(m_iconSize, m_iconSize)];
     }
     [m_native setImage:img];
     [img release];
@@ -403,3 +404,8 @@ QPlatformMenuItem::MenuRole QCocoaMenuItem::effectiveRole() const
     else
         return m_detectedRole;
 }
+
+void QCocoaMenuItem::setIconSize(int size)
+{
+    m_iconSize = size;
+}