diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-09 17:38:19 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-09 17:41:27 +0100 |
| commit | 5d5db225a82964a40178abc360811456dabda8a4 (patch) | |
| tree | ba3933d2244674c140000ee3617da378a5d44f99 /src/plugins/remotelinux/remotelinuxprocesslist.cpp | |
| parent | bddfae718242d8bf2b6868cb6628f97c9b3a10f2 (diff) | |
| download | qt-creator-5d5db225a82964a40178abc360811456dabda8a4.tar.gz | |
SSH: Don't allow external access to process runner's connection object.
It does not belong to the runner anymore after the process has finished,
so we must prevent anyone from getting a copy.
(This includes a minor API fix for RemoteLinux code that depended on
the connection being available.)
Change-Id: Icc28dc3c820f4c2210bb6fb08171cd6a84534dee
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxprocesslist.cpp')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxprocesslist.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/remotelinux/remotelinuxprocesslist.cpp b/src/plugins/remotelinux/remotelinuxprocesslist.cpp index c5f62e363e..aa5ea9db47 100644 --- a/src/plugins/remotelinux/remotelinuxprocesslist.cpp +++ b/src/plugins/remotelinux/remotelinuxprocesslist.cpp @@ -154,7 +154,7 @@ void AbstractRemoteLinuxProcessList::handleConnectionError() { QTC_ASSERT(d->state != Inactive, return); - emit error(tr("Connection failure: %1").arg(d->process.connection()->errorString())); + emit error(tr("Connection failure: %1").arg(d->process.lastConnectionErrorString())); beginResetModel(); d->remoteProcesses.clear(); endResetModel(); @@ -204,8 +204,7 @@ void AbstractRemoteLinuxProcessList::handleRemoteProcessFinished(int exitStatus) void AbstractRemoteLinuxProcessList::startProcess(const QString &cmdLine) { - connect(&d->process, SIGNAL(connectionError(Utils::SshError)), - SLOT(handleConnectionError())); + connect(&d->process, SIGNAL(connectionError()), SLOT(handleConnectionError())); connect(&d->process, SIGNAL(processOutputAvailable(QByteArray)), SLOT(handleRemoteStdOut(QByteArray))); connect(&d->process, SIGNAL(processErrorOutputAvailable(QByteArray)), |