Ticket #46607: qt4-correct-systraymenu-iconhandling.patch

qsystemtrayicon_mac.mm

@@ -341 +341 @@
 -(void)mousePressed:(NSEvent *)mouseEvent button:(Qt::MouseButton)mouseButton
 {
     down = YES;
-    int clickCount = [mouseEvent clickCount];  
+    int clickCount = [mouseEvent clickCount];
     [self setNeedsDisplay:YES];
 
 #ifndef QT_MAC_USE_COCOA
@@ -532 +532 @@
             [item setState:action->isChecked() ? NSOnState : NSOffState];
             [item setToolTip:(NSString*)QCFString::toCFStringRef(action->toolTip())];
             const QIcon icon = action->icon();
-            if(!icon.isNull()) {
+                  // RJVB 20140915: don't forget to check against isIconVisibleInMenu()!
+            if(!icon.isNull() && action->isIconVisibleInMenu()) {
 #ifndef QT_MAC_USE_COCOA
                 const short scale = GetMBarHeight();
 #else