Commit 4ae9f377 authored by hjk's avatar hjk

Debugger: Fix passing connection when starting from commandline

This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 122bd501
......@@ -693,7 +693,9 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit /* = 0 */, QStri
IDevice::ConstPtr device = DeviceKitInformation::device(kit);
if (device) {
sp->connParams = device->sshParameters();
sp->remoteChannel = sp->connParams.host + QLatin1Char(':') + QString::number(sp->connParams.port);
// Could have been set from command line.
if (sp->remoteChannel.isEmpty())
sp->remoteChannel = sp->connParams.host + QLatin1Char(':') + QString::number(sp->connParams.port);
}
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment