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

RemoteLinux: Offer X11 forwarding in run configurations

Browse Source 
Change-Id: I736d76e072a97fa148286c30c4ca36bf4c1253e2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2018-11-01 12:24:03 +01:00
parent 424923817c
commit d775c26bcd
10 changed files with 157 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
View File

@@ -60,6 +60,11 @@ public:
void setState(State newState);
void doSignal(QSsh::SshRemoteProcess::Signal signal);
QString displayName() const
{
return runnable.extraData.value("Ssh.X11ForwardToDisplay").toString();
}
};
SshDeviceProcess::SshDeviceProcess(const IDevice::ConstPtr &device, QObject *parent)
@@ -82,6 +87,12 @@ void SshDeviceProcess::start(const Runnable &runnable)
d->exitCode = -1;
d->runnable = runnable;
d->connection = QSsh::acquireConnection(device()->sshParameters());
const QString displayName = d->displayName();
const QString connDisplayName = d->connection->x11DisplayName();
if (!displayName.isEmpty() && !connDisplayName.isEmpty() && connDisplayName != displayName) {
QSsh::releaseConnection(d->connection);
d->connection = new QSsh::SshConnection(device()->sshParameters(), this);
}
connect(d->connection, &QSsh::SshConnection::error,
this, &SshDeviceProcess::handleConnectionError);
connect(d->connection, &QSsh::SshConnection::disconnected,
@@ -183,6 +194,9 @@ void SshDeviceProcess::handleConnected()
const Utils::Environment env = d->runnable.environment;
for (Utils::Environment::const_iterator it = env.constBegin(); it != env.constEnd(); ++it)
d->process->addToEnvironment(env.key(it).toUtf8(), env.value(it).toUtf8());
const QString display = d->displayName();
if (!display.isEmpty())
d->process->requestX11Forwarding(display);
d->process->start();
}
@@ -346,7 +360,10 @@ void SshDeviceProcess::SshDeviceProcessPrivate::setState(SshDeviceProcess::SshDe
process->disconnect(q);
if (connection) {
connection->disconnect(q);
QSsh::releaseConnection(connection);
if (connection->parent() == q)
connection->deleteLater();
else
QSsh::releaseConnection(connection);
connection = nullptr;
}
}