diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:56:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:56:23 +0200 |
| commit | 90a03391d73034645b85be0d622d5f17d080ebae (patch) | |
| tree | a7e65421be856db997f73353c31d56ad3c69463d /src/plugins/debugger/gdb/gdbengine.cpp | |
| parent | d1dbff3e6ff6da7b580f81ce4d0e9fce3acf5eff (diff) | |
| parent | 894a62325a090fe50b19391f39f088c4ba4a29d5 (diff) | |
| download | qt-creator-90a03391d73034645b85be0d622d5f17d080ebae.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
Diffstat (limited to 'src/plugins/debugger/gdb/gdbengine.cpp')
| -rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index d22916a43d..b97d05ec18 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3852,6 +3852,7 @@ void GdbEngine::setupEngine() if (!debuggerSettings()->loadGdbInit.value()) gdbCommand.addArg("-n"); + // This is filled in DebuggerKitAspect::runnable Environment gdbEnv = rp.debugger.environment; gdbEnv.setupEnglishOutput(); if (rp.runAsRoot) @@ -4044,9 +4045,9 @@ void GdbEngine::setEnvironmentVariables() && str.compare("path", Qt::CaseInsensitive) == 0; }; - Environment sysEnv = Environment::systemEnvironment(); + Environment baseEnv = runParameters().debugger.environment; Environment runEnv = runParameters().inferior.environment; - const NameValueItems items = sysEnv.diff(runEnv); + const NameValueItems items = baseEnv.diff(runEnv); for (const EnvironmentItem &item : items) { // imitate the weird windows gdb behavior of setting the case of the path environment // variable name to an all uppercase PATH |