From 72314b1b5731ce82d32518c30e0177a3aba7ce67 Mon Sep 17 00:00:00 2001 From: Peter Lama Date: Thu, 20 Mar 2014 16:47:35 -0700 Subject: [PATCH] fixes #0001485: 'About FreeCAD' disappears on Mac OS X --- src/Gui/Action.cpp | 5 +++++ src/Gui/Action.h | 1 + src/Gui/CommandStd.cpp | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index 4c6dd3d25ae4..4fa07ac8d2a4 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -191,6 +191,11 @@ QString Action::whatsThis() const return _action->whatsThis(); } +void Action::setMenuRole(QAction::MenuRole menuRole) +{ + _action->setMenuRole(menuRole); +} + // -------------------------------------------------------------------- /** diff --git a/src/Gui/Action.h b/src/Gui/Action.h index 34ce2dd52512..99c47c78f01f 100644 --- a/src/Gui/Action.h +++ b/src/Gui/Action.h @@ -68,6 +68,7 @@ class GuiExport Action : public QObject QString toolTip() const; void setWhatsThis (const QString &); QString whatsThis() const; + void setMenuRole(QAction::MenuRole menuRole); public Q_SLOTS: virtual void onActivated (); diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index 23a4166b8a07..fd135f7f82d7 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -208,7 +208,9 @@ Action * StdCmdAbout::createAction(void) pcAction->setWhatsThis(QLatin1String(sWhatsThis)); pcAction->setIcon(QApplication::windowIcon()); pcAction->setShortcut(QString::fromAscii(sAccel)); - + //Prevent Qt from using AboutRole -- fixes issue #0001485 + pcAction->setMenuRole(QAction::ApplicationSpecificRole); + return pcAction; }