From 8b9c11004c0939ee77bc7245d821426d4e707966 Mon Sep 17 00:00:00 2001 From: follower Date: Tue, 14 Feb 2017 05:46:34 +1300 Subject: [PATCH] Workaround Qt5 bug that fails to remove separator at end of Help menu. When the About menu item is relocated to Application Menu on Mac OS X / macOS the separator above it should be removed. While Qt4 removes the separator, Qt5 does not remove the separator. For details see: * * --- src/gui/MainWindow.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index a5b23b72caa..443cd9bbab5 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -399,7 +399,16 @@ void MainWindow::finalize() tr( "What's This?" ), this, SLOT( enterWhatsThisMode() ) ); +// +// Conditional compilation to workaround Qt5 bug that fails to remove +// separator at end of menu when the About menu item is relocated to +// Application Menu on Mac OS X / macOS. For details see: +// * +// * +// +#if !(defined(LMMS_BUILD_APPLE) && (QT_VERSION >= 0x050000)) help_menu->addSeparator(); +#endif help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ), this, SLOT( aboutLMMS() ) );