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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ ActionManager *ActionManager::instance()
}
/*!
\brief Creates a new menu with the given \a id.
Creates a new menu with the given \a id.
Returns a new ActionContainer that you can use to get the QMenu instance
or to add menu items to the menu. The ActionManager owns
@@ -197,7 +197,7 @@ ActionContainer *ActionManager::createMenu(Id id)
}
/*!
\brief Creates a new menu bar with the given \a id.
Creates a new menu bar with the given \a id.
Returns a new ActionContainer that you can use to get the QMenuBar instance
or to add menus to the menu bar. The ActionManager owns
@@ -222,7 +222,7 @@ ActionContainer *ActionManager::createMenuBar(Id id)
}
/*!
\brief Makes an \a action known to the system under the specified \a id.
Makes an \a action known to the system under the specified \a id.
Returns a command object that represents the action in the application and is
owned by the ActionManager. You can register several actions with the
@@ -244,7 +244,7 @@ Command *ActionManager::registerAction(QAction *action, Id id, const Context &co
}
/*!
\brief Makes a \a shortcut known to the system under the specified \a id.
Makes a \a shortcut known to the system under the specified \a id.
Returns a command object that represents the shortcut in the application and is
owned by the ActionManager. You can registered several shortcuts with the
@@ -293,7 +293,7 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
}
/*!
\brief Returns the Command object that is known to the system
Returns the Command object that is known to the system
under the given \a id.
\sa ActionManager::registerAction()
@@ -311,7 +311,7 @@ Command *ActionManager::command(Id id)
}
/*!
\brief Returns the IActionContainter object that is know to the system
Returns the IActionContainter object that is know to the system
under the given \a id.
\sa ActionManager::createMenu()
@@ -330,7 +330,7 @@ ActionContainer *ActionManager::actionContainer(Id id)
}
/*!
* \brief Returns all commands that have been registered.
* Returns all commands that have been registered.
*/
QList<Command *> ActionManager::commands()
{
@@ -342,7 +342,7 @@ QList<Command *> ActionManager::commands()
}
/*!
\brief Removes the knowledge about an \a action under the specified \a id.
Removes the knowledge about an \a action under the specified \a id.
Usually you do not need to unregister actions. The only valid use case for unregistering
actions, is for actions that represent user definable actions, like for the custom Locator
@@ -373,7 +373,7 @@ void ActionManager::unregisterAction(QAction *action, Id id)
}
/*!
\brief Removes the knowledge about a shortcut under the specified \a id.
Removes the knowledge about a shortcut under the specified \a id.
Usually you do not need to unregister shortcuts. The only valid use case for unregistering
shortcuts, is for shortcuts that represent user definable actions. If the user removes such an action,