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

Revert "Debugger: use correct environment for the cdb process"

Browse Source 
This reverts commit 4749550fbc.

Reason for revert: The debugger environment doesn't contain all path adjustments from the run settings in the project mode.

Fixes: QTCREATORBUG-24045
Change-Id: Ic714e7b99d51d51f74297f916817f302e8c4e1bb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-05-20 05:12:27 +00:00
parent 9ee24391e6
commit 317d0a77a1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -431,24 +431,24 @@ void CdbEngine::setupEngine()
m_outputBuffer.clear();
m_autoBreakPointCorrection = false;
Utils::Environment debuggerEnvironment = sp.debugger.environment.size() == 0
? Utils::Environment::systemEnvironment() : sp.debugger.environment;
Utils::Environment inferiorEnvironment = sp.inferior.environment.size() == 0
? Utils::Environment::systemEnvironment() : sp.inferior.environment;
// Make sure that QTestLib uses OutputDebugString for logging.
const QString qtLoggingToConsoleKey = QStringLiteral("QT_LOGGING_TO_CONSOLE");
if (!sp.useTerminal && !debuggerEnvironment.hasKey(qtLoggingToConsoleKey))
debuggerEnvironment.set(qtLoggingToConsoleKey, "0");
if (!sp.useTerminal && !inferiorEnvironment.hasKey(qtLoggingToConsoleKey))
inferiorEnvironment.set(qtLoggingToConsoleKey, "0");
static const char cdbExtensionPathVariableC[] = "_NT_DEBUGGER_EXTENSION_PATH";
debuggerEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath(), {";"});
inferiorEnvironment.prependOrSet(cdbExtensionPathVariableC, extensionFi.absolutePath(), {";"});
const QByteArray oldCdbExtensionPath = qgetenv(cdbExtensionPathVariableC);
if (!oldCdbExtensionPath.isEmpty()) {
debuggerEnvironment.appendOrSet(cdbExtensionPathVariableC,
inferiorEnvironment.appendOrSet(cdbExtensionPathVariableC,
QString::fromLocal8Bit(oldCdbExtensionPath),
{";"});
}
m_process.setEnvironment(debuggerEnvironment);
m_process.setEnvironment(inferiorEnvironment);
if (!sp.inferior.workingDirectory.isEmpty())
m_process.setWorkingDirectory(sp.inferior.workingDirectory);