feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Another little fix for delayed registering actions.

Browse Source 
Make them be correctly updated regarding to current context.
This commit is contained in:
con
2011-01-18 17:03:14 +01:00
parent bae2cefc45
commit 0a8af1720d
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View File

@@ -372,6 +372,7 @@ Action *ActionManagerPrivate::overridableAction(const Id &id)
m_mainWnd->addAction(a->action()); m_mainWnd->addAction(a->action());
a->action()->setObjectName(id); a->action()->setObjectName(id);
a->action()->setShortcutContext(Qt::ApplicationShortcut); a->action()->setShortcutContext(Qt::ApplicationShortcut);
a->setCurrentContext(m_context);
} }
return a; return a;

1
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -468,6 +468,7 @@ void Action::addOverrideAction(QAction *action, const Core::Context &context, bo
} }
} }
m_scriptableMap[action] = scriptable; m_scriptableMap[action] = scriptable;
setCurrentContext(m_context);
} }
void Action::removeOverrideAction(QAction *action) void Action::removeOverrideAction(QAction *action)