Debugger: Use StandardRunnable in DebuggerStartParameters

This is a mechanical replacement for the former executable, processArgs,
inferiorEnvironment and workingDirectory members.

Change-Id: I4160e01427ed801df9b729f1f31d0a2ca48159b5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-28 10:31:24 +01:00
parent 67e952e888
commit 2cf0060596
26 changed files with 116 additions and 119 deletions

View File

@@ -396,7 +396,7 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit
settings->endGroup();
}
rp->executable = newParameters.runnable.executable;
rp->inferior.executable = newParameters.runnable.executable;
const QString inputAddress = dialog.d->serverAddressEdit->text();
if (!inputAddress.isEmpty())
rp->remoteChannel = inputAddress;
@@ -404,10 +404,10 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit
rp->remoteChannel = rp->connParams.host;
rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort);
rp->displayName = newParameters.displayName();
rp->workingDirectory = newParameters.runnable.workingDirectory;
rp->inferior.workingDirectory = newParameters.runnable.workingDirectory;
rp->useTerminal = newParameters.runnable.runMode == ApplicationLauncher::Console;
if (!newParameters.runnable.commandLineArguments.isEmpty())
rp->processArgs = newParameters.runnable.commandLineArguments;
rp->inferior.commandLineArguments = newParameters.runnable.commandLineArguments;
rp->breakOnMain = newParameters.breakAtMain;
rp->serverStartScript = newParameters.serverStartScript;
rp->debugInfoLocation = newParameters.debugInfoLocation;