Commit 65767164 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk
Browse files

Debugger: Use working directory and environment for core and remote



Source paths in debugging info can be relative

Change-Id: Iff13aef9d779ae190cf91245430af16ed3556cb7
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 7e1a94e5
...@@ -59,6 +59,12 @@ void GdbAttachEngine::setupEngine() ...@@ -59,6 +59,12 @@ void GdbAttachEngine::setupEngine()
{ {
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(_("TRYING TO START ADAPTER")); showMessage(_("TRYING TO START ADAPTER"));
if (!startParameters().workingDirectory.isEmpty())
m_gdbProc.setWorkingDirectory(startParameters().workingDirectory);
if (startParameters().environment.size())
m_gdbProc.setEnvironment(startParameters().environment.toStringList());
startGdb(); startGdb();
} }
......
...@@ -95,6 +95,11 @@ void GdbRemoteServerEngine::setupEngine() ...@@ -95,6 +95,11 @@ void GdbRemoteServerEngine::setupEngine()
m_uploadProc.start(_("/bin/sh ") + arglist); m_uploadProc.start(_("/bin/sh ") + arglist);
m_uploadProc.waitForStarted(); m_uploadProc.waitForStarted();
} }
if (!startParameters().workingDirectory.isEmpty())
m_gdbProc.setWorkingDirectory(startParameters().workingDirectory);
if (startParameters().environment.size())
m_gdbProc.setEnvironment(startParameters().environment.toStringList());
if (startParameters().remoteSetupNeeded) if (startParameters().remoteSetupNeeded)
notifyEngineRequestRemoteSetup(); notifyEngineRequestRemoteSetup();
else else
......
Supports Markdown
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