diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index e475b65fc09..6c6c17911fa 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -268,6 +268,9 @@ public:
     void setServerEssential(bool on) { m_serverEssential = on; }
     bool serverEssential() const { return m_serverEssential; }
 
+    void setAddQmlServerInferiorCmdArgIfNeeded(bool on) { m_addQmlServerInferiorCmdArgIfNeeded = on; }
+    bool isAddQmlServerInferiorCmdArgIfNeeded() const { return m_addQmlServerInferiorCmdArgIfNeeded; }
+
 private:
     DebuggerStartMode m_startMode = NoStartMode;
     DebuggerCloseMode m_closeMode = KillAtClose;
@@ -364,6 +367,7 @@ private:
     Utils::ProcessHandle m_serverAttachPid;
     bool m_serverUseMulti = true;
     bool m_serverEssential = true;
+    bool m_addQmlServerInferiorCmdArgIfNeeded = false;
 };
 
 namespace Internal {
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index a8e940315c6..2f06e45f604 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -79,7 +79,6 @@ static QString noDebuggerInKitMessage()
 class DebuggerRunToolPrivate
 {
 public:
-    bool addQmlServerInferiorCommandLineArgumentIfNeeded = false;
     int snapshotCounter = 0;
     int engineStartsNeeded = 0;
     int engineStopsNeeded = 0;
@@ -100,11 +99,6 @@ public:
 
 } // namespace Internal
 
-void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
-{
-    d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
-}
-
 void DebuggerRunTool::start()
 {
     startCoreFileSetupIfNeededAndContinueStartup();
@@ -221,13 +215,13 @@ void DebuggerRunTool::continueAfterTerminalStart()
 
     if (runControl()->usesQmlChannel()) {
         m_runParameters.setQmlServer(runControl()->qmlChannel());
-        if (d->addQmlServerInferiorCommandLineArgumentIfNeeded
+        if (m_runParameters.isAddQmlServerInferiorCmdArgIfNeeded()
                 && m_runParameters.isQmlDebugging()
                 && m_runParameters.isCppDebugging()) {
 
-            int qmlServerPort = m_runParameters.qmlServer().port();
+            const int qmlServerPort = m_runParameters.qmlServer().port();
             QTC_ASSERT(qmlServerPort > 0, reportFailure(); return);
-            QString mode = QString("port:%1").arg(qmlServerPort);
+            const QString mode = QString("port:%1").arg(qmlServerPort);
 
             auto inferior = m_runParameters.inferior();
             CommandLine cmd{inferior.command.executable()};
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index 2a3b11b2c40..c53a57ec28d 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -33,7 +33,6 @@ public:
     void kickoffTerminalProcess();
     void interruptTerminal();
 
-    void addQmlServerInferiorCommandLineArgumentIfNeeded();
     void setupPortsGatherer();
 
     DebuggerRunParameters &runParameters() { return m_runParameters; }
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index d7f24b52025..b9869920dde 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -51,7 +51,7 @@ public:
             DebuggerRunParameters &rp = debugger->runParameters();
             debugger->setId("RemoteLinuxDebugWorker");
             debugger->setupPortsGatherer();
-            debugger->addQmlServerInferiorCommandLineArgumentIfNeeded();
+            rp.setAddQmlServerInferiorCmdArgIfNeeded(true);
 
             rp.setStartMode(AttachToRemoteServer);
             rp.setCloseMode(KillAndExitMonitorAtClose);