Merge remote-tracking branch 'origin/7.0'

 Conflicts:
	src/libs/ssh/sshremoteprocessrunner.h

Change-Id: I4ce088c68704845ec8ec6feaad10bf747e415bec

3 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/ssh/sshconnectionmanager.cpp b/src/libs/ssh/sshconnectionmanager.cpp
index fff3db499ea..800c4f14f19 100644
--- a/src/libs/ssh/sshconnectionmanager.cpp
+++ b/src/libs/ssh/sshconnectionmanager.cpp
@@ -151,6 +151,7 @@ private:
 
         disconnect(connection, nullptr, this, nullptr);
         connection->deleteLater();
+        m_connections.erase(it);
     }
 
     void removeInactiveConnections()
diff --git a/src/libs/ssh/sshremoteprocessrunner.cpp b/src/libs/ssh/sshremoteprocessrunner.cpp
index 2d34ab4eae3..edbc7219b17 100644
--- a/src/libs/ssh/sshremoteprocessrunner.cpp
+++ b/src/libs/ssh/sshremoteprocessrunner.cpp
@@ -185,7 +185,6 @@ void SshRemoteProcessRunner::setState(int newState)
     }
 }
 
-QString SshRemoteProcessRunner::command() const { return d->m_command; }
 QString SshRemoteProcessRunner::lastConnectionErrorString() const {
     return d->m_lastConnectionErrorString;
 }
diff --git a/src/libs/ssh/sshremoteprocessrunner.h b/src/libs/ssh/sshremoteprocessrunner.h
index 22ed6613fbf..21c4f6b8f68 100644
--- a/src/libs/ssh/sshremoteprocessrunner.h
+++ b/src/libs/ssh/sshremoteprocessrunner.h
@@ -40,7 +40,7 @@ public:
     ~SshRemoteProcessRunner();
 
     void run(const QString &command, const SshConnectionParameters &sshParams);
-    QString command() const;
+    void runInTerminal(const QString &command, const SshConnectionParameters &sshParams);
 
     QString lastConnectionErrorString() const;