diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp
index e4bfed17f0a..f29596ffbb7 100644
--- a/src/libs/utils/launchersocket.cpp
+++ b/src/libs/utils/launchersocket.cpp
@@ -376,7 +376,7 @@ void CallerHandle::start(const QString &program, const QStringList &arguments, c
     p->command = m_command;
     p->arguments = m_arguments;
     p->env = m_environment.toStringList();
-    p->workingDir = m_workingDirectory;
+    p->workingDir = m_workingDirectory.path();
     p->processMode = m_processMode;
     p->writeData = m_writeData;
     p->channelMode = m_channelMode;
@@ -456,13 +456,13 @@ void CallerHandle::setProcessChannelMode(QProcess::ProcessChannelMode mode)
     m_channelMode = mode;
 }
 
-void CallerHandle::setProcessEnvironment(const QProcessEnvironment &environment)
+void CallerHandle::setEnvironment(const Environment &environment)
 {
     QTC_ASSERT(isCalledFromCallersThread(), return);
     m_environment = environment;
 }
 
-void CallerHandle::setWorkingDirectory(const QString &dir)
+void CallerHandle::setWorkingDirectory(const FilePath &dir)
 {
     QTC_ASSERT(isCalledFromCallersThread(), return);
     m_workingDirectory = dir;
diff --git a/src/libs/utils/launchersocket.h b/src/libs/utils/launchersocket.h
index 42b5fa757e8..f341e4fb878 100644
--- a/src/libs/utils/launchersocket.h
+++ b/src/libs/utils/launchersocket.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "environment.h"
+#include "filepath.h"
 #include "launcherpackets.h"
 #include "processutils.h"
 
@@ -111,8 +113,8 @@ public:
     QStringList arguments() const;
     void setStandardInputFile(const QString &fileName);
     void setProcessChannelMode(QProcess::ProcessChannelMode mode);
-    void setProcessEnvironment(const QProcessEnvironment &environment);
-    void setWorkingDirectory(const QString &dir);
+    void setEnvironment(const Environment &environment);
+    void setWorkingDirectory(const FilePath &dir);
     QProcess::ExitStatus exitStatus() const;
 
     void setBelowNormalPriority();
@@ -175,8 +177,8 @@ private:
 
     QString m_command;
     QStringList m_arguments;
-    QProcessEnvironment m_environment;
-    QString m_workingDirectory;
+    Environment m_environment;
+    FilePath m_workingDirectory;
     QByteArray m_writeData;
     QProcess::ProcessChannelMode m_channelMode = QProcess::SeparateChannels;
     QString m_standardInputFile;
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index ebe02d4ebc8..e277ff37602 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -233,8 +233,8 @@ public:
     QByteArray readAllStandardOutput() override { QTC_CHECK(false); return {}; }
     QByteArray readAllStandardError() override { QTC_CHECK(false); return {}; }
 
-    void setProcessEnvironment(const QProcessEnvironment &) override { QTC_CHECK(false); }
-    void setWorkingDirectory(const QString &) override { QTC_CHECK(false); }
+    void setEnvironment(const Environment &) override { QTC_CHECK(false); }
+    void setWorkingDirectory(const FilePath &) override { QTC_CHECK(false); }
     void start(const QString &, const QStringList &, const QByteArray &) override
     { QTC_CHECK(false); }
     void customStart(const CommandLine &command, const FilePath &workingDirectory,
@@ -301,10 +301,10 @@ public:
     QByteArray readAllStandardOutput() override { return m_process->readAllStandardOutput(); }
     QByteArray readAllStandardError() override { return m_process->readAllStandardError(); }
 
-    void setProcessEnvironment(const QProcessEnvironment &environment) override
-    { m_process->setProcessEnvironment(environment); }
-    void setWorkingDirectory(const QString &dir) override
-    { m_process->setWorkingDirectory(dir); }
+    void setEnvironment(const Environment &environment) override
+    { m_process->setProcessEnvironment(environment.toProcessEnvironment()); }
+    void setWorkingDirectory(const FilePath &dir) override
+    { m_process->setWorkingDirectory(dir.path()); }
 
     void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override
     {
@@ -402,9 +402,9 @@ public:
     QByteArray readAllStandardOutput() override { return m_handle->readAllStandardOutput(); }
     QByteArray readAllStandardError() override { return m_handle->readAllStandardError(); }
 
-    void setProcessEnvironment(const QProcessEnvironment &environment) override
-    { m_handle->setProcessEnvironment(environment); }
-    void setWorkingDirectory(const QString &dir) override { m_handle->setWorkingDirectory(dir); }
+    void setEnvironment(const Environment &environment) override
+    { m_handle->setEnvironment(environment); }
+    void setWorkingDirectory(const FilePath &dir) override { m_handle->setWorkingDirectory(dir); }
 
     void start(const QString &program, const QStringList &arguments, const QByteArray &writeData) override
     {
@@ -551,8 +551,8 @@ public:
             qCDebug(processLog) << "STARTING PROCESS: " << ++n << "  " << commandLine.toUserOutput();
         }
 
-        m_process->setProcessEnvironment(environment.toProcessEnvironment());
-        m_process->setWorkingDirectory(workingDirectory.path());
+        m_process->setEnvironment(environment);
+        m_process->setWorkingDirectory(workingDirectory);
 
         QString commandString;
         ProcessArgs arguments;
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index 7e807bb58b5..1bfd3d998b3 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -275,8 +275,8 @@ public:
     virtual QByteArray readAllStandardOutput() = 0;
     virtual QByteArray readAllStandardError() = 0;
 
-    virtual void setProcessEnvironment(const QProcessEnvironment &environment) = 0;
-    virtual void setWorkingDirectory(const QString &dir) = 0;
+    virtual void setEnvironment(const Environment &environment) = 0;
+    virtual void setWorkingDirectory(const FilePath &dir) = 0;
     virtual void start(const QString &program, const QStringList &arguments,
                        const QByteArray &writeData) = 0;
     virtual void customStart(const CommandLine &, const FilePath &,