Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround Qt5 bug that fails to remove separator at end of File/Help menus #3350

Merged
merged 4 commits into from
Feb 19, 2017
Merged

Workaround Qt5 bug that fails to remove separator at end of File/Help menus #3350

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a366f73
Workaround Qt5 bug that fails to remove separator at end of menu.
follower Feb 13, 2017
8b9c110
Workaround Qt5 bug that fails to remove separator at end of Help menu.
follower Feb 13, 2017
eef0662
"Omit needless words." -- William Strunk && tresf :)
follower Feb 15, 2017
1526586
According to Qt, separator issue was fixed in 5.6+, so exclude them.
follower Feb 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/gui/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,10 @@ void MainWindow::finalize()
SLOT( exportProjectMidi() ),
Qt::CTRL + Qt::Key_M );*/

// Prevent dangling separator at end of menu per https://bugreports.qt.io/browse/QTBUG-40071
#if !(defined(LMMS_BUILD_APPLE) && (QT_VERSION >= 0x050000) && (QT_VERSION < 0x050600))
project_menu->addSeparator();
#endif
project_menu->addAction( embed::getIconPixmap( "exit" ), tr( "&Quit" ),
qApp, SLOT( closeAllWindows() ),
Qt::CTRL + Qt::Key_Q );
Expand Down Expand Up @@ -390,7 +393,10 @@ void MainWindow::finalize()
tr( "What's This?" ),
this, SLOT( enterWhatsThisMode() ) );

// Prevent dangling separator at end of menu per https://bugreports.qt.io/browse/QTBUG-40071
#if !(defined(LMMS_BUILD_APPLE) && (QT_VERSION >= 0x050000) && (QT_VERSION < 0x050600))
help_menu->addSeparator();
#endif
help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ),
this, SLOT( aboutLMMS() ) );

Expand Down