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

Revert "Debugger: Disable "Start debugging" when attaching/starting remote"

Browse Source 
This reverts commit c069cd588a.
This commit is contained in:
Friedemann Kleint
2009-11-02 12:57:25 +01:00
parent c069cd588a
commit b8bd20dd42
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -484,8 +484,7 @@ DebuggerPlugin::DebuggerPlugin()
m_cmdLineEnabledEngines(AllEngineTypes), m_cmdLineEnabledEngines(AllEngineTypes),
m_cmdLineAttachPid(0), m_cmdLineAttachPid(0),
m_cmdLineWinCrashEvent(0), m_cmdLineWinCrashEvent(0),
m_toggleLockedAction(0), m_toggleLockedAction(0)
m_peStartDebuggingAction(0)
{} {}
DebuggerPlugin::~DebuggerPlugin() DebuggerPlugin::~DebuggerPlugin()
@@ -670,10 +669,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
Core::ActionContainer *mstart = Core::ActionContainer *mstart =
am->actionContainer(ProjectExplorer::Constants::M_DEBUG_STARTDEBUGGING); 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; Core::Command *cmd = 0;
const DebuggerManagerActions actions = m_manager->debuggerManagerActions(); const DebuggerManagerActions actions = m_manager->debuggerManagerActions();
cmd = am->registerAction(actions.continueAction, cmd = am->registerAction(actions.continueAction,
@@ -809,14 +804,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
connect(resetToSimpleAction, SIGNAL(triggered()), connect(resetToSimpleAction, SIGNAL(triggered()),
m_manager, SLOT(setSimpleDockWidgetArrangement())); 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: // FIXME:
addAutoReleasedObject(new CommonOptionsPage); addAutoReleasedObject(new CommonOptionsPage);
addAutoReleasedObject(new DebuggingHelperOptionPage); addAutoReleasedObject(new DebuggingHelperOptionPage);
@@ -1170,7 +1157,6 @@ void DebuggerPlugin::handleStateChanged(int state)
} else { } else {
core->removeAdditionalContext(m_gdbRunningContext); core->removeAdditionalContext(m_gdbRunningContext);
core->updateContext(); core->updateContext();
m_peStartDebuggingAction->setEnabled(state == DebuggerNotReady);
} }
const bool started = state == InferiorRunning const bool started = state == InferiorRunning

1
src/plugins/debugger/debuggerplugin.h
View File

@@ -143,7 +143,6 @@ private:
QAction *m_attachExternalAction; QAction *m_attachExternalAction;
QAction *m_attachCoreAction; QAction *m_attachCoreAction;
QAction *m_detachAction; QAction *m_detachAction;
QAction *m_peStartDebuggingAction;
}; };
} // namespace Internal } // namespace Internal