CMake: Use Utils::CommandLine for CMakeBuildStep

Change-Id: I0490b1edf073c680f24ad7de10b544443ae62c5e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/cmakeprojectmanager/cmakebuildstep.h

@@ -35,7 +35,10 @@ class QListWidget;
 class QListWidgetItem;
 QT_END_NAMESPACE
 
-namespace Utils { class PathChooser; }
+namespace Utils {
+class CommandLine;
+class PathChooser;
+} // Utils
 
 namespace ProjectExplorer { class ToolChain; }
 
@@ -64,9 +67,7 @@ public:
     QString toolArguments() const;
     void setToolArguments(const QString &list);
 
-    QString allArguments(const CMakeRunConfiguration *rc) const;
-
-    Utils::FilePath cmakeCommand() const;
+    Utils::CommandLine cmakeCommand(CMakeRunConfiguration *rc) const;
 
     QVariantMap toMap() const override;