diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index c05f212d6cc..fc2dc6c21ff 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -182,7 +182,7 @@ bool QMakeStep::init()
     else
         workingDirectory = qmakeBc->buildDirectory().toString();
 
-    m_qmakeExecutable = qtVersion->qmakeCommand().toString();
+    m_qmakeExecutable = qtVersion->qmakeCommand();
     m_qmakeArguments = allArguments(qtVersion);
     m_runMakeQmake = (qtVersion->qtVersion() >= QtVersionNumber(5, 0 ,0));
 
@@ -311,10 +311,10 @@ void QMakeStep::finish(bool success)
     runNextCommand();
 }
 
-void QMakeStep::startOneCommand(const QString &command, const QString &args)
+void QMakeStep::startOneCommand(const FileName &command, const QString &args)
 {
     ProcessParameters *pp = processParameters();
-    pp->setCommand(Utils::FileName::fromString(command));
+    pp->setCommand(command);
     pp->setArguments(args);
     pp->resolveAll();
 
@@ -436,10 +436,10 @@ void QMakeStep::setSeparateDebugInfo(bool enable)
     qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
 }
 
-QString QMakeStep::makeCommand() const
+FileName QMakeStep::makeCommand() const
 {
-    auto *ms = qobject_cast<BuildStepList *>(parent())->firstOfType<MakeStep>();
-    return ms ? ms->effectiveMakeCommand().toString() : QString();
+    auto ms = qobject_cast<BuildStepList *>(parent())->firstOfType<MakeStep>();
+    return ms ? ms->effectiveMakeCommand() : FileName();
 }
 
 QString QMakeStep::makeArguments(const QString &makefile) const
@@ -459,7 +459,7 @@ QString QMakeStep::effectiveQMakeCall() const
     QString qmake = qtVersion ? qtVersion->qmakeCommand().toUserOutput() : QString();
     if (qmake.isEmpty())
         qmake = tr("<no Qt version>");
-    QString make = makeCommand();
+    QString make = makeCommand().toString();
     if (make.isEmpty())
         make = tr("<no Make step found>");
 
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index a0124dc9bb1..cb84ef5c399 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -26,14 +26,13 @@
 #pragma once
 
 #include "qmakeprojectmanager_global.h"
+
 #include <projectexplorer/abstractprocessstep.h>
 
-#include <QStringList>
+#include <utils/fileutils.h>
 
 #include <memory>
 
-namespace Utils { class FileName; }
-
 namespace ProjectExplorer {
 class Abi;
 class BuildStep;
@@ -145,7 +144,7 @@ public:
     bool separateDebugInfo() const;
     void setSeparateDebugInfo(bool enable);
 
-    QString makeCommand() const;
+    Utils::FileName makeCommand() const;
     QString makeArguments(const QString &makefile) const;
     QString effectiveQMakeCall() const;
 
@@ -167,12 +166,12 @@ private:
     void doCancel() override;
     void finish(bool success) override;
 
-    void startOneCommand(const QString &command, const QString &args);
+    void startOneCommand(const Utils::FileName &command, const QString &args);
     void runNextCommand();
 
-    QString m_qmakeExecutable;
+    Utils::FileName m_qmakeExecutable;
     QString m_qmakeArguments;
-    QString m_makeExecutable;
+    Utils::FileName m_makeExecutable;
     QString m_makeArguments;
     QString m_userArgs;
     // Extra arguments for qmake.