# HG changeset patch # User Chris Cannam # Date 1483454086 0 # Node ID f5180edc5dda6cdb319dbd1de2fa06353454a2fc # Parent 0a145f215a4547fba361bdada3a5ae51a98fd219# Parent 8ca62b402846c5b9f3b2a041af1652ca23828ec1 Merge diff -r 8ca62b402846 -r f5180edc5dda main/MainWindow.cpp --- a/main/MainWindow.cpp Tue Jan 03 14:36:31 2017 +0000 +++ b/main/MainWindow.cpp Tue Jan 03 14:34:46 2017 +0000 @@ -279,6 +279,12 @@ frame->setLayout(layout); +#ifdef Q_OS_MAC + // Mac doesn't align menu labels when icons are shown: result is messy + QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); + setIconsVisibleInMenus(false); +#endif + setupMenus(); setupToolbars(); setupHelpMenu();