diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index c8428ee278b..9b143e0c191 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -250,7 +250,6 @@ bool CMakeBuildStep::init()
     ProcessParameters *pp = processParameters();
     setupProcessParameters(pp);
     pp->setCommandLine(cmakeCommand(rc));
-    pp->resolveAll();
 
     return AbstractProcessStep::init();
 }
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
index c481af19344..cd23f2759fc 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
@@ -107,7 +107,6 @@ bool NinjaBuildStep::init()
     // TODO check if the setup is ok
     ProjectExplorer::ProcessParameters *pp = processParameters();
     setupProcessParameters(pp);
-    pp->resolveAll();
 
     return AbstractProcessStep::init();
 }
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index d698e6f41ee..ef558875f0a 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -206,7 +206,6 @@ bool MakeStep::init()
     ProcessParameters *pp = processParameters();
     setupProcessParameters(pp);
     pp->setCommandLine(make);
-    pp->resolveAll();
 
     // If we are cleaning, then make can fail with an error code, but that doesn't mean
     // we should stop the clean queue
diff --git a/src/plugins/projectexplorer/processparameters.cpp b/src/plugins/projectexplorer/processparameters.cpp
index 6d7c78b22a6..58f54c6bffa 100644
--- a/src/plugins/projectexplorer/processparameters.cpp
+++ b/src/plugins/projectexplorer/processparameters.cpp
@@ -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
diff --git a/src/plugins/projectexplorer/processparameters.h b/src/plugins/projectexplorer/processparameters.h
index 3742387d819..e574566617a 100644
--- a/src/plugins/projectexplorer/processparameters.h
+++ b/src/plugins/projectexplorer/processparameters.h
@@ -69,7 +69,6 @@ public:
     QString summary(const QString &displayName) const;
     QString summaryInWorkdir(const QString &displayName) const;
 
-    void resolveAll();
 private:
     Utils::FilePath m_workingDirectory;
     Utils::CommandLine m_command;
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 50b6fc1e551..99eade86bb8 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -121,7 +121,6 @@ void ProcessStep::setupProcessParameters(ProcessParameters *pp)
     pp->setEnvironment(buildEnvironment());
     pp->setWorkingDirectory(FilePath::fromString(workingDirectory));
     pp->setCommandLine({m_command->filePath(), m_arguments->value(), CommandLine::Raw});
-    pp->resolveAll();
 }
 
 // ProcessStepFactory
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index 7d003a157fc..1aac3658758 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -162,7 +162,6 @@ bool QmakeMakeStep::init()
 
     pp->setEnvironment(makeEnvironment());
     pp->setCommandLine(makeCmd);
-    pp->resolveAll();
 
     auto rootNode = dynamic_cast<QmakeProFileNode *>(project()->rootProjectNode());
     QTC_ASSERT(rootNode, return false);