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

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>

src/plugins/debugger/debuggerplugin.cpp

@@ -1457,8 +1457,7 @@ void DebuggerPluginPrivate::attachExternalApplication(ProjectExplorer::RunContro
     sp.attachPID = rc->applicationProcessHandle().pid();
     sp.displayName = tr("Debugger attached to %1").arg(rc->displayName());
     sp.startMode = AttachExternal;
-    //sp.toolChainAbi = anyAbiOfBinary(sp.executable);
-    sp.toolChainAbi = ProjectExplorer::Abi::hostAbi(); // FIXME: Extract from RunControl?
+    sp.toolChainAbi = rc->abi();
     if (DebuggerRunControl *rc = createDebugger(sp))
         startDebugger(rc);
 }

src/plugins/projectexplorer/runconfiguration.cpp

@@ -534,6 +534,13 @@ QString RunControl::displayName() const
     return m_displayName;
 }
 
+Abi RunControl::abi() const
+{
+    if (const RunConfiguration *rc = m_runConfiguration.data())
+        return rc->abi();
+    return Abi();
+}
+
 ProcessHandle RunControl::applicationProcessHandle() const
 {
     return m_applicationProcessHandle;

src/plugins/projectexplorer/runconfiguration.h

@@ -232,6 +232,7 @@ public:
 
     ProcessHandle applicationProcessHandle() const;
     void setApplicationProcessHandle(const ProcessHandle &handle);
+    Abi abi() const;
 
     bool sameRunConfiguration(const RunControl *other) const;