From 62ada96091ff514f616b6cd683b5a666dfb1c5b1 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 12 Sep 2017 13:50:45 +0200
Subject: [PATCH] Debugger: Remove serverStartScript run parameter

Instead, create the resulting RunWorker as dependency directly.

Change-Id: Id15005bb5707bb97dfc61cc2f84409e759e60f9f
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/debugger/debuggerdialogs.cpp    |  2 +-
 src/plugins/debugger/debuggerengine.cpp     |  1 -
 src/plugins/debugger/debuggerengine.h       |  1 -
 src/plugins/debugger/debuggerruncontrol.cpp | 17 ++++++++---------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index dd18e7055be..8668243ab46 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -433,9 +433,9 @@ void StartApplicationDialog::run(bool attachRemote)
         debugger->setRemoteChannel(dev->sshParameters().host, newParameters.serverPort);
     debugger->setRunControlName(newParameters.displayName());
     debugger->setBreakOnMain(newParameters.breakAtMain);
-    debugger->setServerStartScript(newParameters.serverStartScript);
     debugger->setDebugInfoLocation(newParameters.debugInfoLocation);
     debugger->setInferior(inferior);
+    debugger->setServerStartScript(newParameters.serverStartScript); // Note: This requires inferior.
     debugger->setNeedFixup(false);
 
     bool isLocal = !dev || (dev->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 9f8bb6a861a..7d46ca6cc08 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -108,7 +108,6 @@ QDebug operator<<(QDebug str, const DebuggerRunParameters &sp)
             << " attachPID=" << sp.attachPID.pid()
             << " useTerminal=" << sp.useTerminal
             << " remoteChannel=" << sp.remoteChannel
-            << " serverStartScript=" << sp.serverStartScript
             << " abi=" << sp.toolChainAbi.toString() << '\n';
     return str;
 }
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 2e93c1f4cc4..74fafa81434 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -141,7 +141,6 @@ public:
     QString startMessage; // First status message shown.
     QString debugInfoLocation; // Gdb "set-debug-file-directory".
     QStringList debugSourceLocation; // Gdb "directory"
-    QString serverStartScript;
     bool isSnapshot = false; // Set if created internally.
     ProjectExplorer::Abi toolChainAbi;
 
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 18cfbda37f4..7cd3b7aa269 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -279,7 +279,14 @@ void DebuggerRunTool::setCommandsForReset(const QString &commands)
 
 void DebuggerRunTool::setServerStartScript(const QString &serverStartScript)
 {
-    m_runParameters.serverStartScript = serverStartScript;
+    if (!serverStartScript.isEmpty()) {
+        // Provide script information about the environment
+        StandardRunnable serverStarter;
+        serverStarter.executable = serverStartScript;
+        QtcProcess::addArg(&serverStarter.commandLineArguments, m_runParameters.inferior.executable);
+        QtcProcess::addArg(&serverStarter.commandLineArguments, m_runParameters.remoteChannel);
+        addStartDependency(new LocalProcessRunner(runControl(), serverStarter));
+    }
 }
 
 void DebuggerRunTool::setDebugInfoLocation(const QString &debugInfoLocation)
@@ -852,14 +859,6 @@ void DebuggerRunTool::setRunParameters(const DebuggerRunParameters &rp)
 {
     m_runParameters = rp;
 
-    if (!rp.serverStartScript.isEmpty()) {
-        // Provide script information about the environment
-        StandardRunnable serverStarter;
-        serverStarter.executable = rp.serverStartScript;
-        QtcProcess::addArg(&serverStarter.commandLineArguments, rp.inferior.executable);
-        QtcProcess::addArg(&serverStarter.commandLineArguments, rp.remoteChannel);
-        addStartDependency(new LocalProcessRunner(runControl(), serverStarter));
-    }
 }
 
 DebuggerEngine *DebuggerRunTool::activeEngine() const