diff options
| author | Eike Ziller <[email protected]> | 2013-09-27 10:44:32 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-09-27 10:44:32 +0200 |
| commit | 63ff7452137958215988d9f2f6066de955500be0 (patch) | |
| tree | d645a26ae9db68cdbf37e9fd997a221c81eea008 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 19c735a4912487e8038f08ea0b617ccce62cd1a3 (diff) | |
| parent | a12a9f491cb31ff5c22f1051bb22ccfef6c65217 (diff) | |
Merge remote-tracking branch 'origin/2.8'
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
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 28b0859c329..6e4606e8842 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -159,7 +159,7 @@ \brief The DebuggerEngine class is the base class of a debugger engine. - Note: the Debugger process itself and any helper processes like + \note The Debugger process itself and any helper processes like gdbserver are referred to as 'Engine', whereas the debugged process is referred to as 'Inferior'. @@ -330,9 +330,11 @@ sg1: } GdbEngine specific startup. All happens in EngineSetupRequested state: - Transitions marked by '---' are done in the individual adapters. + \list + \li Transitions marked by '---' are done in the individual adapters. - Transitions marked by '+-+' are done in the GdbEngine. + \li Transitions marked by '+-+' are done in the GdbEngine. + \endlist \code GdbEngine::setupEngine() |