Commit ba54fa8a authored by David Schulz's avatar David Schulz

Debugger: Do not override environment when using run in terminal

Change-Id: I4ab30bb81462de34c4c7f9c4ef0b10f7731f5bcc
Reviewed-by: default avatarhjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 9ebe266a
......@@ -85,7 +85,6 @@ public:
ProjectExplorer::StandardRunnable inferior;
QString displayName; // Used in the Snapshots view.
Utils::Environment stubEnvironment;
Utils::ProcessHandle attachPID;
QStringList solibSearchPath;
......
......@@ -675,8 +675,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))
......
......@@ -175,8 +175,6 @@ TerminalRunner::TerminalRunner(DebuggerRunTool *debugger)
const DebuggerRunParameters &rp = debugger->runParameters();
m_stubRunnable = rp.inferior;
m_stubRunnable.environment = rp.stubEnvironment;
m_stubRunnable.workingDirectory = rp.inferior.workingDirectory;
connect(&m_stubProc, &ConsoleProcess::processError,
this, &TerminalRunner::stubError);
......
Markdown is supported
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