forked from qt-creator/qt-creator
ProjectExplorer: Remove ProcessParameters::resolveAll()
On all code paths, this was implicit in a ProcessParameters::setCommandLine() which was on all code paths either called directly immediately before, or as part of ProcessStep::setupProcessParameters(). With ProcessParameters::setCommandLine() as only user, this could be inlined there. The effectiveWorkingDirectory() turned out to be out of place and rather accidentally working there and was moved to ProcessParameters::setWorkingDirectory(). Change-Id: I634f6086c2324e3cbecd3e5d50e22afc722abd3f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -63,7 +63,9 @@ void ProcessParameters::setCommandLine(const CommandLine &cmdLine)
|
||||
m_command = cmdLine;
|
||||
m_effectiveCommand.clear();
|
||||
m_effectiveArguments.clear();
|
||||
resolveAll();
|
||||
|
||||
effectiveCommand();
|
||||
effectiveArguments();
|
||||
}
|
||||
|
||||
|
||||
@@ -77,6 +79,8 @@ void ProcessParameters::setWorkingDirectory(const FilePath &workingDirectory)
|
||||
{
|
||||
m_workingDirectory = workingDirectory;
|
||||
m_effectiveWorkingDirectory.clear();
|
||||
|
||||
effectiveWorkingDirectory();
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -201,11 +205,4 @@ QString ProcessParameters::summaryInWorkdir(const QString &displayName) const
|
||||
QDir::toNativeSeparators(effectiveWorkingDirectory().toString()));
|
||||
}
|
||||
|
||||
void ProcessParameters::resolveAll()
|
||||
{
|
||||
effectiveCommand();
|
||||
effectiveArguments();
|
||||
effectiveWorkingDirectory();
|
||||
}
|
||||
|
||||
} // ProcessExplorer
|
||||
|
||||
Reference in New Issue
Block a user