diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-12-19 14:25:13 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-12-20 13:00:18 +0000 |
| commit | 41a88b0763ee4548463e4652ace2e97cb81eba6c (patch) | |
| tree | f505c84d29c4c5ed9ba0e914937e9ff13db13258 /src/libs/ssh | |
| parent | 62be56b8d5359e04cdae01c48e878ca45d097d55 (diff) | |
SSH: Disable connection sharing on Windows
It does not work on that platform.
Change-Id: Ic46c51aae57c34f63480bd838a2a62faa5056bc6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/libs/ssh')
| -rw-r--r-- | src/libs/ssh/sshsettings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/ssh/sshsettings.cpp b/src/libs/ssh/sshsettings.cpp index 0a0cb0dedc..12f17bbade 100644 --- a/src/libs/ssh/sshsettings.cpp +++ b/src/libs/ssh/sshsettings.cpp @@ -26,6 +26,7 @@ #include "sshsettings.h" #include <utils/environment.h> +#include <utils/hostosinfo.h> #include <QSettings> @@ -36,7 +37,7 @@ namespace Internal { struct SshSettings { - bool useConnectionSharing = true; + bool useConnectionSharing = !HostOsInfo::isWindowsHost(); int connectionSharingTimeOutInMinutes = 10; FileName sshFilePath; FileName sftpFilePath; @@ -73,7 +74,7 @@ void SshSettings::loadSettings(QSettings *settings) { AccessSettingsGroup g(settings); QVariant value = settings->value(connectionSharingKey()); - if (value.isValid()) + if (value.isValid() && !HostOsInfo::isWindowsHost()) sshSettings->useConnectionSharing = value.toBool(); value = settings->value(connectionSharingTimeoutKey()); if (value.isValid()) |