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

ProcessParameters: Reuse ProcessRunData

Browse Source 
Change-Id: I0fdde4303d23ed1350cc36846319264f952df42b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-17 14:08:06 +02:00
parent ec7abcf98c
commit 17d8f61f93
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/processparameters.h
View File

@@ -5,9 +5,7 @@
#include "projectexplorer_export.h"
#include <utils/commandline.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/processinterface.h>
namespace Utils {
class MacroExpander;
@@ -22,13 +20,13 @@ public:
ProcessParameters();
void setCommandLine(const Utils::CommandLine &cmdLine);
Utils::CommandLine command() const { return m_command; }
Utils::CommandLine command() const { return m_runData.command; }
void setWorkingDirectory(const Utils::FilePath &workingDirectory);
Utils::FilePath workingDirectory() const { return m_workingDirectory; }
Utils::FilePath workingDirectory() const { return m_runData.workingDirectory; }
void setEnvironment(const Utils::Environment &env) { m_environment = env; }
Utils::Environment environment() const { return m_environment; }
void setEnvironment(const Utils::Environment &env) { m_runData.environment = env; }
Utils::Environment environment() const { return m_runData.environment; }
void setMacroExpander(Utils::MacroExpander *mx) { m_macroExpander = mx; }
Utils::MacroExpander *macroExpander() const { return m_macroExpander; }
@@ -49,9 +47,7 @@ public:
QString summaryInWorkdir(const QString &displayName) const;
private:
Utils::FilePath m_workingDirectory;
Utils::CommandLine m_command;
Utils::Environment m_environment;
Utils::ProcessRunData m_runData;
Utils::MacroExpander *m_macroExpander = nullptr;
mutable Utils::FilePath m_effectiveWorkingDirectory;