Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
b8bd20dd
Commit
b8bd20dd
authored
Nov 02, 2009
by
Friedemann Kleint
Browse files
Revert "Debugger: Disable "Start debugging" when attaching/starting remote"
This reverts commit
c069cd58
.
parent
c069cd58
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerplugin.cpp
View file @
b8bd20dd
...
...
@@ -484,8 +484,7 @@ DebuggerPlugin::DebuggerPlugin()
m_cmdLineEnabledEngines
(
AllEngineTypes
),
m_cmdLineAttachPid
(
0
),
m_cmdLineWinCrashEvent
(
0
),
m_toggleLockedAction
(
0
),
m_peStartDebuggingAction
(
0
)
m_toggleLockedAction
(
0
)
{}
DebuggerPlugin
::~
DebuggerPlugin
()
...
...
@@ -670,10 +669,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
Core
::
ActionContainer
*
mstart
=
am
->
actionContainer
(
ProjectExplorer
::
Constants
::
M_DEBUG_STARTDEBUGGING
);
// Register an action "Continue" under a different context (Gdb Running)
// in the action manager under the "Start Debugging" action's id.
// Activating this context will then cause the "Start Debugging" action
// to switch to "Continue".
Core
::
Command
*
cmd
=
0
;
const
DebuggerManagerActions
actions
=
m_manager
->
debuggerManagerActions
();
cmd
=
am
->
registerAction
(
actions
.
continueAction
,
...
...
@@ -809,14 +804,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
connect
(
resetToSimpleAction
,
SIGNAL
(
triggered
()),
m_manager
,
SLOT
(
setSimpleDockWidgetArrangement
()));
// Retrieve "Start debugging" action from Project explorer.
if
(
const
Core
::
Command
*
dcmd
=
am
->
command
(
QLatin1String
(
ProjectExplorer
::
Constants
::
DEBUG
)))
{
m_peStartDebuggingAction
=
dcmd
->
action
();
}
else
{
*
errorMessage
=
QLatin1String
(
"Internal error: Cannot access external actions"
);
return
false
;
}
// FIXME:
addAutoReleasedObject
(
new
CommonOptionsPage
);
addAutoReleasedObject
(
new
DebuggingHelperOptionPage
);
...
...
@@ -1170,7 +1157,6 @@ void DebuggerPlugin::handleStateChanged(int state)
}
else
{
core
->
removeAdditionalContext
(
m_gdbRunningContext
);
core
->
updateContext
();
m_peStartDebuggingAction
->
setEnabled
(
state
==
DebuggerNotReady
);
}
const
bool
started
=
state
==
InferiorRunning
...
...
src/plugins/debugger/debuggerplugin.h
View file @
b8bd20dd
...
...
@@ -143,7 +143,6 @@ private:
QAction
*
m_attachExternalAction
;
QAction
*
m_attachCoreAction
;
QAction
*
m_detachAction
;
QAction
*
m_peStartDebuggingAction
;
};
}
// namespace Internal
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment