Debugger: Inline/Remove rarely used argument handling

Change-Id: Ibe97f3e406a4fc01569aa8e1325531ce4764adca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

2 files changed, 7 insertions, 19 deletions

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index a740c741d5..d48f22ded8 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -486,20 +486,6 @@ void DebuggerRunTool::setCoreFileName(const QString &coreFile, bool isSnapshot)
     m_runParameters.isSnapshot = isSnapshot;
 }
 
-void DebuggerRunTool::appendInferiorCommandLineArgument(const QString &arg)
-{
-    QtcProcess::addArg(&m_runParameters.inferior.commandLineArguments, arg,
-                       device() ? device()->osType() : HostOsInfo::hostOs());
-}
-
-void DebuggerRunTool::prependInferiorCommandLineArgument(const QString &arg)
-{
-    if (!m_runParameters.inferior.commandLineArguments.isEmpty())
-        m_runParameters.inferior.commandLineArguments.prepend(' ');
-    m_runParameters.inferior.commandLineArguments.prepend(
-                QtcProcess::quoteArg(arg, device() ? device()->osType() : HostOsInfo::hostOs()));
-}
-
 void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
 {
     d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
@@ -531,12 +517,16 @@ void DebuggerRunTool::start()
         if (d->addQmlServerInferiorCommandLineArgumentIfNeeded
                 && m_runParameters.isQmlDebugging
                 && m_runParameters.isCppDebugging()) {
-            using namespace QmlDebug;
+
             int qmlServerPort = m_runParameters.qmlServer.port();
             QTC_ASSERT(qmlServerPort > 0, reportFailure(); return);
             QString mode = QString("port:%1").arg(qmlServerPort);
-            QString qmlServerArg = qmlDebugCommandLineArguments(QmlDebuggerServices, mode, true);
-            prependInferiorCommandLineArgument(qmlServerArg);
+
+            CommandLine cmd{m_runParameters.inferior.executable};
+            cmd.addArg(qmlDebugCommandLineArguments(QmlDebug::QmlDebuggerServices, mode, true));
+            cmd.addArgs(m_runParameters.inferior.commandLineArguments, CommandLine::Raw);
+
+            m_runParameters.inferior.setCommandLine(cmd);
         }
     }
 
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index ca219ad1bf..b0377cc5fb 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -77,8 +77,6 @@ public:
     void setInferiorDevice(ProjectExplorer::IDevice::ConstPtr device); // Used by cdbengine
     void setRunControlName(const QString &name);
     void setStartMessage(const QString &msg);
-    void appendInferiorCommandLineArgument(const QString &arg);
-    void prependInferiorCommandLineArgument(const QString &arg);
     void addQmlServerInferiorCommandLineArgumentIfNeeded();
 
     void setCrashParameter(const QString &event);