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

Debugger: Fix environment passed to inferior by gdb

Browse Source 
We must not set variables that the user disabled.

Change-Id: I2f559aefd6aaa43298dd9c4889a614a5130622c0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-08-26 14:59:45 +02:00
parent ce19b108d1
commit 4f2a21541e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3801,10 +3801,12 @@ void GdbEngine::setEnvironmentVariables()
// imitate the weird windows gdb behavior of setting the case of the path environment // imitate the weird windows gdb behavior of setting the case of the path environment
// variable name to an all uppercase PATH // variable name to an all uppercase PATH
const QString name = isWindowsPath(item.name) ? "PATH" : item.name; const QString name = isWindowsPath(item.name) ? "PATH" : item.name;
if (item.operation == EnvironmentItem::Unset) if (item.operation == EnvironmentItem::Unset
|| item.operation == EnvironmentItem::SetDisabled) {
runCommand({"unset environment " + name}); runCommand({"unset environment " + name});
else } else {
runCommand({"-gdb-set environment " + name + '=' + item.value}); runCommand({"-gdb-set environment " + name + '=' + item.value});
}
} }
} }