feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove serverStartScript run parameter

Browse Source 
Instead, create the resulting RunWorker as dependency directly.

Change-Id: Id15005bb5707bb97dfc61cc2f84409e759e60f9f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2017-09-12 13:50:45 +02:00
parent ace413a74c
commit 62ada96091
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -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