diff -r dee5afe5301f -r 3f74d0d4af4c src/gui/util/qsystemtrayicon_mac.mm --- a/src/gui/util/qsystemtrayicon_mac.mm Mon Mar 15 12:43:09 2010 +0200 +++ b/src/gui/util/qsystemtrayicon_mac.mm Thu Apr 08 14:19:33 2010 +0300 @@ -530,7 +530,11 @@ [item setToolTip:(NSString*)QCFString::toCFStringRef(action->toolTip())]; const QIcon icon = action->icon(); if(!icon.isNull()) { +#ifndef QT_MAC_USE_COCOA + const short scale = GetMBarHeight(); +#else const short scale = [[NSApp mainMenu] menuBarHeight]; +#endif NSImage *nsimage = static_cast(qt_mac_create_nsimage(icon.pixmap(QSize(scale, scale)))); [item setImage: nsimage]; [nsimage release];