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

Debugger: Move modifyDebuggerEnvironment into DebuggerRunParameters

Browse Source 
Amends a6e780782b

Change-Id: Ia127702955e1776a46f32b953521057368e17799
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 18:39:41 +01:00
parent 13f3e73968
commit a0fe1d329b
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,6 +194,9 @@ public:
bool runAsRoot() const { return m_runAsRoot; }
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &items) {
m_debugger.environment.modify(items);
}
Utils::ProcessRunData debugger() const { return m_debugger; }
void setOverrideStartScript(const Utils::FilePath &script) { m_overrideStartScript = script; }

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

@@ -105,11 +105,6 @@ void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
}
void DebuggerRunTool::modifyDebuggerEnvironment(const EnvironmentItems &items)
{
m_runParameters.debugger().environment.modify(items);
}
void DebuggerRunTool::start()
{
startCoreFileSetupIfNeededAndContinueStartup();

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

@@ -36,8 +36,6 @@ public:
void addQmlServerInferiorCommandLineArgumentIfNeeded();
void setupPortsGatherer();
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
DebuggerRunParameters &runParameters() { return m_runParameters; }
private:

2
src/plugins/qnx/qnxdebugsupport.cpp
View File

@@ -210,7 +210,7 @@ public:
rp.setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k)));
if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k))) {
rp.setSysRoot(qtVersion->qnxTarget());
debugger->modifyDebuggerEnvironment(qtVersion->environment());
rp.modifyDebuggerEnvironment(qtVersion->environment());
}
return debugger;