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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
This commit is contained in:
Eike Ziller
2012-04-03 10:03:52 +02:00
parent 1ba94139b1 8d5d1f2f66
commit 078d570721
19 changed files with 1027 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ namespace {
To do this, you register your action via the
registerAction methods, get the action container for a specific ID (like specified in
the Core::Constants namespace) with a call of
actionContainer(const QString&) and add your command to this container.
actionContainer(const Id&) and add your command to this container.
Following the example adding "My Action" to the "Tools" menu would be done by
\code
@@ -171,7 +171,7 @@ namespace {
\brief Makes an \a action known to the system under the specified string \a id.
Returns a command object that represents the action in the application and is
owned by the ActionManager. You can registered several actions with the
owned by the ActionManager. You can register several actions with the
same \a id as long as the \a context is different. In this case
a trigger of the actual action is forwarded to the registered QAction
for the currently active context.
@@ -180,7 +180,7 @@ namespace {
*/
/*!
\fn Command *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const Context &context, bool scriptable)
\fn Command *ActionManager::registerShortcut(QShortcut *shortcut, const Id &id, const Context &context, bool scriptable)
\brief Makes a \a shortcut known to the system under the specified string \a id.
Returns a command object that represents the shortcut in the application and is