From 3d9409311f4bca8d951127ac8916d964568571cf Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 29 Jan 2016 17:22:33 +0100 Subject: [PATCH] Valgrind: Quickfix for remote execution. Lots of stuff is still horribly broken due to the weird confusion between local/remote and "has project"/"does not have project" that crept in at some point, but this at least makes remote, project-specific memcheck work again. Still broken: - Remote callgrind - All remote valgrinds for external projects. - Local remote valgrind is not even available (anymore), as the respective menu entries have disappeared at some point. Change-Id: Iae6b60a0508d1b1b64fd0e0e5f776ea2c2e23598 Reviewed-by: hjk --- src/plugins/valgrind/valgrindprocess.cpp | 1 + src/plugins/valgrind/valgrindruncontrolfactory.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index 34f3c8ee31e..2fbb4e2be59 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -42,6 +42,7 @@ ValgrindProcess::ValgrindProcess(bool isLocal, const QSsh::SshConnectionParamete : QObject(parent), m_isLocal(isLocal) { + m_isLocal = sshParams.host.isEmpty(); m_remote.m_params = sshParams; m_remote.m_connection = connection; m_remote.m_error = QProcess::UnknownError; diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp index 8c0c747d3a9..9caf08ee5c1 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -81,8 +81,6 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration qWarning() << "Cannot open port on host for profiling."; return 0; } - connection.connParams.host = server.serverAddress().toString(); - connection.connParams.port = server.serverPort(); } else { connection.connParams = device->sshParameters(); }