From cad9372ad9287ea8c95a5bde936810d47f898c4a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 2 May 2016 20:40:51 +0300 Subject: [PATCH] Debugger: Do not append port if host not found When choosing a kit with a bare metal device in Attach to Running Server and *not* overriding the address, the address is not determined. Change-Id: I431d0edee0635cda773e94737752aa9c31a1cac2 Reviewed-by: hjk --- src/plugins/debugger/debuggerdialogs.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 872c0f027f2..66bf3b1a2a2 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -402,7 +402,8 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit rp->remoteChannel = inputAddress; else rp->remoteChannel = rp->connParams.host; - rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort); + if (!rp->remoteChannel.isEmpty()) + rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort); rp->displayName = newParameters.displayName(); rp->inferior.workingDirectory = newParameters.runnable.workingDirectory; rp->useTerminal = newParameters.runnable.runMode == ApplicationLauncher::Console;