kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix duplicate about entries in mac app menu

Browse Source 
Clearing the menu bar does not remove the actions from the app menu,
but setting the action role allows Qt to take care of duplicates.
This commit is contained in:
Peter Lama
2018-03-26 09:20:31 -07:00
parent adb13f7c59
commit cf6c4032d7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Gui/CommandStd.cpp
View File

@@ -203,10 +203,14 @@ Action * StdCmdAbout::createAction(void)
this->className(), sStatusTip).arg(exe));
pcAction->setWhatsThis(QLatin1String(sWhatsThis));
pcAction->setIcon(QApplication::windowIcon());
pcAction->setShortcut(QString::fromLatin1(sAccel));
//Prevent Qt from using AboutRole -- fixes issue #0001485
pcAction->setShortcut(QString::fromLatin1(sAccel));
#if QT_VERSION > 0x050000
// Needs to have AboutRole set to avoid duplicates if adding the about action more than once on macOS
pcAction->setMenuRole(QAction::AboutRole);
#else
// With Qt 4.8, having AboutRole set causes it to disappear when readding it: issue #0001485
pcAction->setMenuRole(QAction::ApplicationSpecificRole);
#endif
return pcAction;
}