Commit b4afce82 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk

Pass Abi when attaching debugger to application launched via 'Run'.

Task-number: QTCREATORBUG-5808

Change-Id: Id35e13fd71f4de7912070e90cda6add07200c7ae
Reviewed-on: http://codereview.qt.nokia.com/3069Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent fa0f114f
...@@ -1457,8 +1457,7 @@ void DebuggerPluginPrivate::attachExternalApplication(ProjectExplorer::RunContro ...@@ -1457,8 +1457,7 @@ void DebuggerPluginPrivate::attachExternalApplication(ProjectExplorer::RunContro
sp.attachPID = rc->applicationProcessHandle().pid(); sp.attachPID = rc->applicationProcessHandle().pid();
sp.displayName = tr("Debugger attached to %1").arg(rc->displayName()); sp.displayName = tr("Debugger attached to %1").arg(rc->displayName());
sp.startMode = AttachExternal; sp.startMode = AttachExternal;
//sp.toolChainAbi = anyAbiOfBinary(sp.executable); sp.toolChainAbi = rc->abi();
sp.toolChainAbi = ProjectExplorer::Abi::hostAbi(); // FIXME: Extract from RunControl?
if (DebuggerRunControl *rc = createDebugger(sp)) if (DebuggerRunControl *rc = createDebugger(sp))
startDebugger(rc); startDebugger(rc);
} }
......
...@@ -534,6 +534,13 @@ QString RunControl::displayName() const ...@@ -534,6 +534,13 @@ QString RunControl::displayName() const
return m_displayName; return m_displayName;
} }
Abi RunControl::abi() const
{
if (const RunConfiguration *rc = m_runConfiguration.data())
return rc->abi();
return Abi();
}
ProcessHandle RunControl::applicationProcessHandle() const ProcessHandle RunControl::applicationProcessHandle() const
{ {
return m_applicationProcessHandle; return m_applicationProcessHandle;
......
...@@ -232,6 +232,7 @@ public: ...@@ -232,6 +232,7 @@ public:
ProcessHandle applicationProcessHandle() const; ProcessHandle applicationProcessHandle() const;
void setApplicationProcessHandle(const ProcessHandle &handle); void setApplicationProcessHandle(const ProcessHandle &handle);
Abi abi() const;
bool sameRunConfiguration(const RunControl *other) const; bool sameRunConfiguration(const RunControl *other) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment