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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	qtcreator.pri
This commit is contained in:
con
2011-04-29 10:27:58 +02:00
parent 5e6d92dd66 8c74bc10d4
commit 1689a2cded
6 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggerengine.cpp
View File

@@ -146,6 +146,7 @@ public:
m_state(DebuggerNotReady),
m_lastGoodState(DebuggerNotReady),
m_targetState(DebuggerNotReady),
m_inferiorPid(0),
m_modulesHandler(),
m_registerHandler(),
m_sourceFilesHandler(),
@@ -157,6 +158,8 @@ public:
m_isStateDebugging(false)
{
connect(&m_locationTimer, SIGNAL(timeout()), SLOT(resetLocation()));
if (sp.toolChainAbi.os() == ProjectExplorer::Abi::MacOS)
m_disassemblerAgent.setTryMixed(false);
}
~DebuggerEnginePrivate() {}
@@ -542,7 +545,6 @@ void DebuggerEngine::resetLocation()
void DebuggerEngine::gotoLocation(const Location &loc)
{
if (debuggerCore()->boolSetting(OperateByInstruction) || !loc.hasDebugInfo()) {
d->m_disassemblerAgent.setTryMixed(true);
d->m_disassemblerAgent.setLocation(loc);
return;
}
@@ -1584,7 +1586,6 @@ void DebuggerEngine::updateMemoryViews()
void DebuggerEngine::openDisassemblerView(const Location &location)
{
DisassemblerAgent *agent = new DisassemblerAgent(this);
agent->setTryMixed(true);
agent->setLocation(location);
}