From 61bb1b9df8398723acc5f0061e204386919e8fb1 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 10 Feb 2012 10:40:41 +0100
Subject: [PATCH] RemoteLinux: Use explicit address for gdbserver to listen on.
This way, our code (if not gdbserver's) is IPv6-safe.
Change-Id: I8cb95f5f3b01ba89b01d98f0bc00428979c16752
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/remotelinux/remotelinuxdebugsupport.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index dddc6bd71de..43e94f74410 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -209,8 +209,9 @@ void AbstractRemoteLinuxDebugSupport::startExecution()
const QString remoteCommandLine = (d->qmlDebugging && !d->cppDebugging)
? QString::fromLatin1("%1 %2 %3").arg(runner()->commandPrefix()).arg(remoteExe).arg(args)
- : QString::fromLatin1("%1 gdbserver :%2 %3 %4").arg(runner()->commandPrefix())
- .arg(d->gdbServerPort).arg(remoteExe).arg(args);
+ : QString::fromLatin1("%1 gdbserver %5:%2 %3 %4").arg(runner()->commandPrefix())
+ .arg(d->gdbServerPort).arg(remoteExe).arg(args)
+ .arg(runner()->connection()->connectionInfo().peerAddress.toString());
connect(runner(), SIGNAL(remoteProcessFinished(qint64)),
SLOT(handleRemoteProcessFinished(qint64)));
runner()->startExecution(remoteCommandLine.toUtf8());
--
GitLab