feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Postpone the decision on whether its a local run

Browse Source 
The decision is wrong anyway, no harm done. Move it closer to a
location where it can be done correctly.

Change-Id: I92de8ffec92cae6b3de3322d5045b696ae62932f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
hjk
2016-01-30 02:38:05 +01:00
parent 678d142497
commit 0ffbb5a041
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/valgrind/valgrindprocess.cpp
View File

@@ -37,13 +37,11 @@ using namespace ProjectExplorer;
namespace Valgrind {
ValgrindProcess::ValgrindProcess(bool isLocal, const QSsh::SshConnectionParameters &sshParams,
ValgrindProcess::ValgrindProcess(const QSsh::SshConnectionParameters &sshParams,
QSsh::SshConnection *connection, QObject *parent)
: QObject(parent),
m_isLocal(isLocal)
: QObject(parent)
{
m_isLocal = sshParams.host.isEmpty();
m_remote.m_params = sshParams;
m_params = sshParams;
m_remote.m_connection = connection;
m_remote.m_error = QProcess::UnknownError;
m_pid = 0;
@@ -129,7 +127,7 @@ void ValgrindProcess::run()
} else {
// connect to host and wait for connection
if (!m_remote.m_connection)
m_remote.m_connection = new QSsh::SshConnection(m_remote.m_params, this);
m_remote.m_connection = new QSsh::SshConnection(m_params, this);
if (m_remote.m_connection->state() != QSsh::SshConnection::Connected) {
connect(m_remote.m_connection, &QSsh::SshConnection::connected,
@@ -227,6 +225,11 @@ QSsh::SshConnection *ValgrindProcess::connection() const
return m_remote.m_connection;
}
bool ValgrindProcess::isLocal() const
{
return m_params.host.isEmpty();
}
void ValgrindProcess::localProcessStarted()
{
m_pid = m_localProcess.applicationPID();