From fae2052549a8af2143a47813f2f27d2843e8aad4 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Thu, 18 Apr 2013 10:42:12 +0200 Subject: [PATCH] Set "About Qt Designer plugins..." menu entry role to NoRole This fixes a problem on Mac, where the default menu role is TextHeuristic, and menu item syncing would reassing this entry as "About Qt Creator". Also ProxyAction would not forward the menu role. Task-number: QTBUG-30679 Change-Id: If5ad5fb3a34131c080543bf8160e9ab5140c8585 Reviewed-by: Eike Ziller --- src/libs/utils/proxyaction.cpp | 4 +++- src/plugins/designer/formeditorw.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/proxyaction.cpp b/src/libs/utils/proxyaction.cpp index 6bf38879dfc..def6ca807a4 100644 --- a/src/libs/utils/proxyaction.cpp +++ b/src/libs/utils/proxyaction.cpp @@ -120,8 +120,10 @@ void ProxyAction::update(QAction *action, bool initialize) return; disconnectAction(); disconnect(this, SIGNAL(changed()), this, SLOT(updateToolTipWithKeySequence())); - if (initialize) + if (initialize) { setSeparator(action->isSeparator()); + setMenuRole(action->menuRole()); + } if (hasAttribute(UpdateIcon) || initialize) { setIcon(action->icon()); setIconText(action->iconText()); diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 7eda1df9f97..4aa5ac8cc05 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -561,7 +561,8 @@ void FormEditorW::setupActions() addToolAction(actionFormSettings, m_contexts, Core::Id("FormEditor.FormSettings"), mformtools); mformtools->addSeparator(m_contexts); - m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins...."), this); + m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins..."), this); + m_actionAboutPlugins->setMenuRole(QAction::NoRole); addToolAction(m_actionAboutPlugins, m_contexts, Core::Id("FormEditor.AboutPlugins"), mformtools); connect(m_actionAboutPlugins, SIGNAL(triggered()), m_fwm,