forked from qt-creator/qt-creator
Debugger: Use working directory and environment for core and remote
Source paths in debugging info can be relative Change-Id: Iff13aef9d779ae190cf91245430af16ed3556cb7 Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -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()
|
|||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user