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

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

Browse Source 
Task-number: QTCREATORBUG-5808

Change-Id: Id35e13fd71f4de7912070e90cda6add07200c7ae
Reviewed-on: http://codereview.qt.nokia.com/3069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2011-08-17 09:06:59 +02:00
committed by hjk
parent fa0f114f74
commit b4afce82a6
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }

7
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -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;

1
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -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;