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

Merge remote-tracking branch 'origin/4.9' into 4.10

Browse Source 
Change-Id: I5775afb845c26afa6fae9bdfc47dc9c3f9d5b975
This commit is contained in:
Eike Ziller
2019-06-06 06:56:15 +02:00
parent 337e8c71c8 6178e871da
commit e459bc6091
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/ssh/sshconnection.cpp
View File

@@ -348,8 +348,10 @@ void SshConnection::doConnectToHost()
.arg(sshBinary.toUserOutput()));
return;
}
if (!d->sharingEnabled)
if (!d->sharingEnabled) {
emitConnected();
return;
}
d->masterSocketDir.reset(new QTemporaryDir);
if (!d->masterSocketDir->isValid()) {
emitError(tr("Cannot establish SSH connection: Failed to create temporary "