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

Debugger: Do not override environment when using run in terminal

Browse Source 
Change-Id: I4ab30bb81462de34c4c7f9c4ef0b10f7731f5bcc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
David Schulz
2017-10-16 13:58:51 +02:00
parent 9ebe266ae5
commit ba54fa8a10
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/debuggerengine.h
View File

@@ -85,7 +85,6 @@ public:
ProjectExplorer::StandardRunnable inferior; ProjectExplorer::StandardRunnable inferior;
QString displayName; // Used in the Snapshots view. QString displayName; // Used in the Snapshots view.
Utils::Environment stubEnvironment;
Utils::ProcessHandle attachPID; Utils::ProcessHandle attachPID;
QStringList solibSearchPath; QStringList solibSearchPath;

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

@@ -675,8 +675,6 @@ bool DebuggerRunTool::fixupParameters()
if (rp.symbolFile.isEmpty()) if (rp.symbolFile.isEmpty())
rp.symbolFile = rp.inferior.executable; rp.symbolFile = rp.inferior.executable;
rp.stubEnvironment = rp.inferior.environment; // FIXME: Wrong, but contains DYLD_IMAGE_SUFFIX
// Copy over DYLD_IMAGE_SUFFIX etc // Copy over DYLD_IMAGE_SUFFIX etc
for (auto var : QStringList({"DYLD_IMAGE_SUFFIX", "DYLD_LIBRARY_PATH", "DYLD_FRAMEWORK_PATH"})) for (auto var : QStringList({"DYLD_IMAGE_SUFFIX", "DYLD_LIBRARY_PATH", "DYLD_FRAMEWORK_PATH"}))
if (rp.inferior.environment.hasKey(var)) if (rp.inferior.environment.hasKey(var))

2
src/plugins/debugger/terminal.cpp
View File

@@ -175,8 +175,6 @@ TerminalRunner::TerminalRunner(DebuggerRunTool *debugger)
const DebuggerRunParameters &rp = debugger->runParameters(); const DebuggerRunParameters &rp = debugger->runParameters();
m_stubRunnable = rp.inferior; m_stubRunnable = rp.inferior;
m_stubRunnable.environment = rp.stubEnvironment;
m_stubRunnable.workingDirectory = rp.inferior.workingDirectory;
connect(&m_stubProc, &ConsoleProcess::processError, connect(&m_stubProc, &ConsoleProcess::processError,
this, &TerminalRunner::stubError); this, &TerminalRunner::stubError);