Fix disassembler view on Xcode4.

The gdb shipped with Xcode4 simply never returns if the command is
"disassemble /m someaddress", Xcode3 returned an error, which resulted
in a call for non-mixed disassembly. So we set the disassembler agent to
not try mixed in case of Mac tool chain abi.

Reviewed-by: Friedemann Kleint

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index aed919bcbf..e84fb090c0 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -180,6 +180,8 @@ public:
         m_isStateDebugging(false)
     {
         connect(&m_locationTimer, SIGNAL(timeout()), SLOT(resetLocation()));
+        if (sp.toolChainAbi.os() == ProjectExplorer::Abi::MacOS)
+            m_disassemblerAgent.setTryMixed(false);
     }
 
     ~DebuggerEnginePrivate() {}
@@ -559,7 +561,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;
     }
@@ -1591,7 +1592,6 @@ void DebuggerEngine::updateMemoryViews()
 void DebuggerEngine::openDisassemblerView(const Location &location)
 {
     DisassemblerAgent *agent = new DisassemblerAgent(this);
-    agent->setTryMixed(true);
     agent->setLocation(location);
 }