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

Debugger: Fix Action enabling, implement breakOnMain for CDB.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-05-04 15:40:15 +02:00
parent 2e1954ae47
commit e7cb7471c0
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1396,15 +1396,7 @@ void DebuggerPluginPrivate::startExternalApplication()
// Set up an ARM Symbian Abi
sp.toolChainAbi = Abi(Abi::ArmArchitecture, Abi::SymbianOS, Abi::SymbianDeviceFlavor, Abi::ElfFormat, false);
if (dlg.breakAtMain()) {
#ifdef Q_OS_WIN
// FIXME: wrong on non-Qt based binaries
breakHandler()->breakByFunction("qMain");
#else
breakHandler()->breakByFunction("main");
#endif
}
sp.breakOnMain = dlg.breakAtMain();
if (RunControl *rc = m_debuggerRunControlFactory->create(sp))
startDebugger(rc);
}
@@ -2100,7 +2092,10 @@ void DebuggerPluginPrivate::updateDebugActions()
{
ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
Project *project = pe->startupProject();
m_debugAction->setEnabled(pe->canRun(project, Constants::DEBUGMODE));
m_debugAction->setEnabled(pe->canRun(project, _(Constants::DEBUGMODE)));
const bool canStepInto = pe->canRun(project, _(Constants::DEBUGMODE2));
m_stepAction->setEnabled(canStepInto);
m_nextAction->setEnabled(canStepInto);
}
void DebuggerPluginPrivate::onCoreAboutToOpen()