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

Merge remote-tracking branch 'origin/4.5' into master

Browse Source 
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
This commit is contained in:
Orgad Shaneh
2017-10-17 20:00:44 +03:00
parent 5c554c0de9 aa4e05f07b
commit 371b2bbbab
128 changed files with 412 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -428,6 +428,11 @@ void DebuggerRunTool::setInferiorExecutable(const QString &executable)
m_runParameters.inferior.executable = executable;
}
void DebuggerRunTool::setInferiorEnvironment(const Utils::Environment &env)
{
m_runParameters.inferior.environment = env;
}
void DebuggerRunTool::setRunControlName(const QString &name)
{
m_runParameters.displayName = name;
@@ -671,8 +676,6 @@ bool DebuggerRunTool::fixupParameters()
if (rp.symbolFile.isEmpty())
rp.symbolFile = rp.inferior.executable;
rp.stubEnvironment = rp.inferior.environment; // FIXME: Wrong, but contains DYLD_IMAGE_SUFFIX
// Copy over DYLD_IMAGE_SUFFIX etc
for (auto var : QStringList({"DYLD_IMAGE_SUFFIX", "DYLD_LIBRARY_PATH", "DYLD_FRAMEWORK_PATH"}))
if (rp.inferior.environment.hasKey(var))