From 169ced3e0836b3782c122e0fe82016fadac68c49 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 7 Jun 2019 15:26:00 +0200
Subject: [PATCH] CMake: Use Utils::CommandLine in CMakeProcess

Change-Id: If8dc221232869012d38ca7c02012cb7db5482d3a
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakeprocess.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
index 4255d89ad01..41529f17528 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
@@ -126,16 +126,15 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
     connect(process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &CMakeProcess::handleProcessFinished);
 
-    QString args;
-    Utils::QtcProcess::addArg(&args, srcDir);
-    Utils::QtcProcess::addArgs(&args, parameters.generatorArguments);
-    Utils::QtcProcess::addArgs(&args, arguments);
+    QStringList args(srcDir);
+    args += parameters.generatorArguments;
+    args += arguments;
+    Utils::CommandLine commandLine(cmake->cmakeExecutable(), args);
 
     TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
 
-    Core::MessageManager::write(tr("Running \"%1 %2\" in %3.")
-                                .arg(cmake->cmakeExecutable().toUserOutput())
-                                .arg(args)
+    Core::MessageManager::write(tr("Running %1 in %2.")
+                                .arg(commandLine.toUserOutput())
                                 .arg(workDirectory.toUserOutput()));
 
     auto future = std::make_unique<QFutureInterface<void>>();
@@ -144,7 +143,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
                                    tr("Configuring \"%1\"").arg(parameters.projectName),
                                    "CMake.Configure");
 
-    process->setCommand(Utils::CommandLine(cmake->cmakeExecutable(), args, Utils::CommandLine::Raw));
+    process->setCommand(commandLine);
     emit started();
     process->start();