forked from qt-creator/qt-creator
ActionManager support for iconVisibleInMenu
This commit is contained in:
@@ -367,6 +367,8 @@ Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const
|
||||
baseAction->setParent(m_mainWnd);
|
||||
#ifdef Q_WS_MAC
|
||||
baseAction->setIconVisibleInMenu(false);
|
||||
#else
|
||||
baseAction->setIconVisibleInMenu(action->isIconVisibleInMenu());
|
||||
#endif
|
||||
a->setAction(baseAction);
|
||||
m_mainWnd->addAction(baseAction);
|
||||
|
||||
@@ -493,6 +493,9 @@ void Action::actionChanged()
|
||||
if (hasAttribute(CA_UpdateIcon)) {
|
||||
m_action->setIcon(m_currentAction->icon());
|
||||
m_action->setIconText(m_currentAction->iconText());
|
||||
#ifndef Q_WS_MAC
|
||||
m_action->setIconVisibleInMenu(m_currentAction->isIconVisibleInMenu());
|
||||
#endif
|
||||
}
|
||||
if (hasAttribute(CA_UpdateText)) {
|
||||
m_action->setText(m_currentAction->text());
|
||||
|
||||
Reference in New Issue
Block a user