From 4749550fbcd6f227407d5f8e71ae3bf2b08e02fa Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 13 May 2020 11:46:09 +0200 Subject: [PATCH] Debugger: use correct environment for the cdb process Change-Id: I7027be25df7380810b7c8fbd0e9bc5b9abd67dc3 Reviewed-by: hjk --- src/plugins/debugger/cdb/cdbengine.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 056991b06bf..270f56a5410 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -431,24 +431,24 @@ void CdbEngine::setupEngine() m_outputBuffer.clear(); m_autoBreakPointCorrection = false; - Utils::Environment inferiorEnvironment = sp.inferior.environment.size() == 0 - ? Utils::Environment::systemEnvironment() : sp.inferior.environment; + Utils::Environment debuggerEnvironment = sp.debugger.environment.size() == 0 + ? Utils::Environment::systemEnvironment() : sp.debugger.environment; // Make sure that QTestLib uses OutputDebugString for logging. const QString qtLoggingToConsoleKey = QStringLiteral("QT_LOGGING_TO_CONSOLE"); - if (!sp.useTerminal && !inferiorEnvironment.hasKey(qtLoggingToConsoleKey)) - inferiorEnvironment.set(qtLoggingToConsoleKey, "0"); + if (!sp.useTerminal && !debuggerEnvironment.hasKey(qtLoggingToConsoleKey)) + debuggerEnvironment.set(qtLoggingToConsoleKey, "0"); static const char cdbExtensionPathVariableC[] = "_NT_DEBUGGER_EXTENSION_PATH"; - inferiorEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath(), {";"}); + debuggerEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath(), {";"}); const QByteArray oldCdbExtensionPath = qgetenv(cdbExtensionPathVariableC); if (!oldCdbExtensionPath.isEmpty()) { - inferiorEnvironment.appendOrSet(cdbExtensionPathVariableC, + debuggerEnvironment.appendOrSet(cdbExtensionPathVariableC, QString::fromLocal8Bit(oldCdbExtensionPath), {";"}); } - m_process.setEnvironment(inferiorEnvironment); + m_process.setEnvironment(debuggerEnvironment); if (!sp.inferior.workingDirectory.isEmpty()) m_process.setWorkingDirectory(sp.inferior.workingDirectory);