Get rid of Ssh lib

Move the rest to ProjectExplorer plugin.

Change-Id: Id2f022359e7e01728779228ea1f7f0b05a81c8e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/libs/CMakeLists.txt

@@ -13,7 +13,6 @@ add_subdirectory(qmldebug)
 add_subdirectory(qmleditorwidgets)
 add_subdirectory(glsl)
 add_subdirectory(languageserverprotocol)
-add_subdirectory(ssh)
 add_subdirectory(sqlite)
 add_subdirectory(tracing)
 

src/libs/libs.qbs

@@ -20,7 +20,6 @@ Project {
         "qmldebug/qmldebug.qbs",
         "qtcreatorcdbext/qtcreatorcdbext.qbs",
         "sqlite/sqlite.qbs",
-        "ssh/ssh.qbs",
         "tracing/tracing.qbs",
         "utils/process_stub.qbs",
         "utils/process_ctrlc_stub.qbs",

src/libs/ssh/CMakeLists.txt

@@ -1,7 +0,0 @@
-add_qtc_library(QtcSsh
-  DEPENDS Qt5::Core Qt5::Network Qt5::Widgets Utils
-  SOURCES
-    ssh_global.h
-    sshparameters.cpp sshparameters.h
-    sshsettings.cpp sshsettings.h
-)

src/libs/ssh/ssh.qbs

@@ -1,28 +0,0 @@
-import qbs 1.0
-
-Project {
-    name: "QtcSsh"
-
-    QtcLibrary {
-        cpp.defines: {
-            var defines = base;
-            defines.push("QTCSSH_LIBRARY");
-            if (project.withAutotests && !defines.contains("WITH_TESTS"))
-                defines.push("WITH_TESTS");
-            return defines;
-        }
-        cpp.enableExceptions: true
-
-        Depends { name: "Qt"; submodules: ["widgets", "network" ] }
-        Depends { name: "Utils" }
-
-        files: [
-            "sshparameters.cpp",
-            "sshparameters.h",
-            "sshsettings.cpp",
-            "sshsettings.h",
-        ]
-
-        Export { Depends { name: "Qt.network" } }
-    }
-}

src/libs/ssh/ssh_global.h

@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QtGlobal>
-
-#if defined(QTCSSH_LIBRARY)
-#  define QSSH_EXPORT Q_DECL_EXPORT
-#elif defined(QTCSSH_STATIC_LIBRARY)
-#  define QSSH_EXPORT
-#else
-#  define QSSH_EXPORT Q_DECL_IMPORT
-#endif
-
-#ifdef WITH_TESTS
-#  define QSSH_AUTOTEST_EXPORT QSSH_EXPORT
-#else
-#  define QSSH_AUTOTEST_EXPORT
-#endif

src/plugins/android/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(Android
-  DEPENDS QtcSsh QmlDebug Qt5::Xml LanguageServerProtocol
+  DEPENDS QmlDebug Qt5::Xml LanguageServerProtocol
   PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient
   SOURCES
     addnewavddialog.ui

src/plugins/boot2qt/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_qtc_plugin(Boot2Qt
   PLUGIN_CLASS QdbPlugin
-  DEPENDS Qt5::Network QtcSsh
+  DEPENDS Qt5::Network
   PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
   SOURCES
     qdb.qrc

src/plugins/boot2qt/qdbdevice.cpp

@@ -32,12 +32,11 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/runcontrol.h>
 
 #include <remotelinux/linuxprocessinterface.h>
 
-#include <ssh/sshparameters.h>
-
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
@@ -48,7 +47,6 @@
 #include <QWizard>
 
 using namespace ProjectExplorer;
-using namespace QSsh;
 using namespace RemoteLinux;
 using namespace Utils;
 

src/plugins/clangtools/clangtools.qbs

@@ -9,7 +9,6 @@ QtcPlugin {
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport"; condition: qtc.testsEnabled }
-    Depends { name: "QtcSsh" }
     Depends { name: "TextEditor" }
     Depends { name: "Utils" }
 

src/plugins/debugger/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(Debugger
-  DEPENDS LanguageUtils QmlDebug QmlJS QtcSsh registryaccess
+  DEPENDS LanguageUtils QmlDebug QmlJS registryaccess
   PLUGIN_DEPENDS Core CppEditor ProjectExplorer QtSupport TextEditor
   PLUGIN_RECOMMENDS QmakeProjectManager
   PLUGIN_TEST_DEPENDS QmakeProjectManager

src/plugins/debugger/analyzer/startremotedialog.cpp

@@ -28,12 +28,11 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/runcontrol.h>
 
-#include <ssh/sshparameters.h>
-
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QLineEdit>

src/plugins/debugger/debugger.qbs

@@ -7,7 +7,6 @@ Project {
         Depends { name: "Qt"; submodules: ["widgets", "network"] }
         Depends { name: "Aggregation" }
         Depends { name: "CPlusPlus" }
-        Depends { name: "QtcSsh" }
         Depends { name: "QmlDebug" }
         Depends { name: "LanguageUtils" }
         Depends { name: "QmlJS" }
@@ -256,7 +255,6 @@ Project {
         }
 
         Export {
-            Depends { name: "QtcSsh" }
             Depends { name: "CPlusPlus" }
         }
     }

src/plugins/debugger/debuggerdialogs.cpp

@@ -33,11 +33,10 @@
 
 #include <coreplugin/icore.h>
 
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 
-#include <ssh/sshparameters.h>
-
 #include <utils/fancylineedit.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>

src/plugins/debugger/debuggerplugin.cpp

@@ -90,6 +90,7 @@
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/itaskhandler.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -102,8 +103,6 @@
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/toolchain.h>
 
-#include <ssh/sshparameters.h>
-
 #include <texteditor/texteditor.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/fontsettings.h>
@@ -378,7 +377,6 @@ using namespace Debugger::Constants;
 using namespace Debugger::Internal;
 using namespace ExtensionSystem;
 using namespace ProjectExplorer;
-using namespace QSsh;
 using namespace TextEditor;
 using namespace Utils;
 

src/plugins/projectexplorer/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(ProjectExplorer
-  DEPENDS QtcSsh Qt5::Qml
+  DEPENDS Qt5::Qml
   PLUGIN_DEPENDS Core TextEditor
   PLUGIN_TEST_DEPENDS GenericProjectManager
   SOURCES
@@ -66,6 +66,8 @@ add_qtc_plugin(ProjectExplorer
     devicesupport/idevicewidget.h
     devicesupport/localprocesslist.cpp devicesupport/localprocesslist.h
     devicesupport/sshdeviceprocesslist.cpp devicesupport/sshdeviceprocesslist.h
+    devicesupport/sshparameters.cpp devicesupport/sshparameters.h
+    devicesupport/sshsettings.cpp devicesupport/sshsettings.h
     devicesupport/sshsettingspage.cpp devicesupport/sshsettingspage.h
     editorconfiguration.cpp editorconfiguration.h
     editorsettingspropertiespage.cpp editorsettingspropertiespage.h editorsettingspropertiespage.ui

src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp

@@ -25,8 +25,9 @@
 
 #include "deviceusedportsgatherer.h"
 
+#include "sshparameters.h"
+
 #include <projectexplorer/devicesupport/idevice.h>
-#include <ssh/sshparameters.h>
 #include <utils/port.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>

src/plugins/projectexplorer/devicesupport/idevice.cpp

@@ -25,16 +25,15 @@
 
 #include "idevice.h"
 
-#include "devicemanager.h"
+#include "sshparameters.h"
+
 #include "deviceprocesslist.h"
 #include "idevicefactory.h"
 
 #include "../kit.h"
 #include "../kitinformation.h"
-#include "../runconfiguration.h"
 
 #include <coreplugin/icore.h>
-#include <ssh/sshparameters.h>
 #include <utils/displayname.h>
 #include <utils/icon.h>
 #include <utils/portlist.h>
@@ -100,7 +99,6 @@
  * Creates an identical copy of a device object.
  */
 
-using namespace QSsh;
 using namespace Utils;
 
 namespace ProjectExplorer {
@@ -735,7 +733,7 @@ void IDevice::setSshParameters(const SshParameters &sshParameters)
 QUrl IDevice::toolControlChannel(const ControlChannelHint &) const
 {
     QUrl url;
-    url.setScheme(Utils::urlTcpScheme());
+    url.setScheme(urlTcpScheme());
     QReadLocker locker(&d->lock);
     url.setHost(d->sshParameters.host());
     return url;
@@ -785,7 +783,7 @@ FilePath IDevice::debugDumperPath() const
     return d->debugDumperPath;
 }
 
-void IDevice::setDebugDumperPath(const Utils::FilePath &path)
+void IDevice::setDebugDumperPath(const FilePath &path)
 {
     d->debugDumperPath = path;
 }

src/plugins/projectexplorer/devicesupport/idevice.h

@@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 QT_END_NAMESPACE
 
-namespace QSsh { class SshParameters; }
-
 namespace Utils {
 class CommandLine;
 class Environment;
@@ -63,6 +61,7 @@ namespace ProjectExplorer {
 
 class DeviceProcessList;
 class Kit;
+class SshParameters;
 class Task;
 
 namespace Internal { class IDevicePrivate; }
@@ -192,8 +191,8 @@ public:
     static QString defaultPrivateKeyFilePath();
     static QString defaultPublicKeyFilePath();
 
-    QSsh::SshParameters sshParameters() const;
-    void setSshParameters(const QSsh::SshParameters &sshParameters);
+    SshParameters sshParameters() const;
+    void setSshParameters(const SshParameters &sshParameters);
 
     enum ControlChannelHint { QmlControlChannel };
     virtual QUrl toolControlChannel(const ControlChannelHint &) const;

src/plugins/projectexplorer/devicesupport/sshparameters.cpp

@@ -39,7 +39,7 @@
 
 using namespace Utils;
 
-namespace QSsh {
+namespace ProjectExplorer {
 
 SshParameters::SshParameters()
 {
@@ -178,12 +178,12 @@ SshParameters getParameters()
     params.setPort(getPortFromEnvironment());
     params.timeout = 10;
     params.authenticationType = !params.privateKeyFile.isEmpty()
-            ? QSsh::SshParameters::AuthenticationTypeSpecificKey
-            : QSsh::SshParameters::AuthenticationTypeAll;
+            ? SshParameters::AuthenticationTypeSpecificKey
+            : SshParameters::AuthenticationTypeAll;
     return params;
 }
 
-bool checkParameters(const QSsh::SshParameters &params)
+bool checkParameters(const SshParameters &params)
 {
     if (qEnvironmentVariableIsSet("QTC_SSH_TEST_DEFAULTS"))
         return true;
@@ -219,4 +219,4 @@ void printSetupHelp()
 } // namespace SshTest
 #endif
 
-} // namespace QSsh
+} // namespace ProjectExplorer

src/plugins/projectexplorer/devicesupport/sshparameters.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "ssh_global.h"
+#include "../projectexplorer_export.h"
 
 #include <utils/filepath.h>
 
@@ -33,7 +33,7 @@
 
 namespace Utils { class QtcProcess; }
 
-namespace QSsh {
+namespace ProjectExplorer {
 
 enum SshHostKeyCheckingMode {
     SshHostKeyCheckingNone,
@@ -41,7 +41,7 @@ enum SshHostKeyCheckingMode {
     SshHostKeyCheckingAllowNoMatch,
 };
 
-class QSSH_EXPORT SshParameters
+class PROJECTEXPLORER_EXPORT SshParameters
 {
 public:
     enum AuthenticationType {
@@ -71,22 +71,22 @@ public:
     static bool setupSshEnvironment(Utils::QtcProcess *process);
 };
 
-QSSH_EXPORT bool operator==(const SshParameters &p1, const SshParameters &p2);
-QSSH_EXPORT bool operator!=(const SshParameters &p1, const SshParameters &p2);
+PROJECTEXPLORER_EXPORT bool operator==(const SshParameters &p1, const SshParameters &p2);
+PROJECTEXPLORER_EXPORT bool operator!=(const SshParameters &p1, const SshParameters &p2);
 
 #ifdef WITH_TESTS
 namespace SshTest {
-const QString QSSH_EXPORT getHostFromEnvironment();
-quint16 QSSH_EXPORT getPortFromEnvironment();
-const QString QSSH_EXPORT getUserFromEnvironment();
-const QString QSSH_EXPORT getKeyFileFromEnvironment();
-const QSSH_EXPORT QString userAtHost();
-SshParameters QSSH_EXPORT getParameters();
-bool QSSH_EXPORT checkParameters(const SshParameters &params);
-void QSSH_EXPORT printSetupHelp();
+const QString PROJECTEXPLORER_EXPORT getHostFromEnvironment();
+quint16 PROJECTEXPLORER_EXPORT getPortFromEnvironment();
+const QString PROJECTEXPLORER_EXPORT getUserFromEnvironment();
+const QString PROJECTEXPLORER_EXPORT getKeyFileFromEnvironment();
+const PROJECTEXPLORER_EXPORT QString userAtHost();
+SshParameters PROJECTEXPLORER_EXPORT getParameters();
+bool PROJECTEXPLORER_EXPORT checkParameters(const SshParameters &params);
+void PROJECTEXPLORER_EXPORT printSetupHelp();
 } // namespace SshTest
 #endif
 
-} // namespace QSsh
+} // namespace ProjectExplorer
 
-Q_DECLARE_METATYPE(QSsh::SshParameters::AuthenticationType)
+Q_DECLARE_METATYPE(ProjectExplorer::SshParameters::AuthenticationType)

src/plugins/projectexplorer/devicesupport/sshsettings.cpp

@@ -33,7 +33,7 @@
 
 using namespace Utils;
 
-namespace QSsh {
+namespace ProjectExplorer {
 namespace Internal {
 
 struct SshSettings
@@ -44,14 +44,13 @@ struct SshSettings
     FilePath sftpFilePath;
     FilePath askpassFilePath;
     FilePath keygenFilePath;
-    QSsh::SshSettings::SearchPathRetriever searchPathRetriever = [] { return FilePaths(); };
+    ProjectExplorer::SshSettings::SearchPathRetriever searchPathRetriever = [] { return FilePaths(); };
     QReadWriteLock lock;
 };
 
 } // namespace Internal
 
-Q_GLOBAL_STATIC(QSsh::Internal::SshSettings, sshSettings)
-
+Q_GLOBAL_STATIC(Internal::SshSettings, sshSettings)
 
 class AccessSettingsGroup
 {
@@ -204,4 +203,4 @@ void SshSettings::setExtraSearchPathRetriever(const SearchPathRetriever &pathRet
     sshSettings->searchPathRetriever = pathRetriever;
 }
 
-} // namespace QSsh
+} // namespace ProjectExplorer

src/plugins/projectexplorer/devicesupport/sshsettings.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "ssh_global.h"
+#include "../projectexplorer_export.h"
 
 #include <utils/fileutils.h>
 
@@ -35,9 +35,9 @@ QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
-namespace QSsh {
+namespace ProjectExplorer {
 
-class QSSH_EXPORT SshSettings
+class PROJECTEXPLORER_EXPORT SshSettings
 {
 public:
     static void loadSettings(QSettings *settings);
@@ -65,4 +65,4 @@ public:
     static void setExtraSearchPathRetriever(const SearchPathRetriever &pathRetriever);
 };
 
-} // namespace QSsh
+} // namespace ProjectExplorer

src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp

@@ -24,10 +24,10 @@
 ****************************************************************************/
 
 #include "sshsettingspage.h"
+#include "sshsettings.h"
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <ssh/sshsettings.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
 
@@ -36,7 +36,6 @@
 #include <QFormLayout>
 #include <QSpinBox>
 
-using namespace QSsh;
 using namespace Utils;
 
 namespace ProjectExplorer {

src/plugins/projectexplorer/kitinformation.cpp

@@ -30,6 +30,7 @@
 #include "devicesupport/devicemanager.h"
 #include "devicesupport/devicemanagermodel.h"
 #include "devicesupport/idevicefactory.h"
+#include "devicesupport/sshparameters.h"
 #include "projectexplorerconstants.h"
 #include "kit.h"
 #include "toolchain.h"
@@ -37,8 +38,6 @@
 
 #include <docker/dockerconstants.h>
 
-#include <ssh/sshparameters.h>
-
 #include <utils/algorithm.h>
 #include <utils/elidinglabel.h>
 #include <utils/environment.h>

src/plugins/projectexplorer/projectexplorer.cpp

@@ -60,6 +60,7 @@
 #include "devicesupport/desktopdevicefactory.h"
 #include "devicesupport/devicemanager.h"
 #include "devicesupport/devicesettingspage.h"
+#include "devicesupport/sshsettings.h"
 #include "devicesupport/sshsettingspage.h"
 #include "editorsettingspropertiespage.h"
 #include "filesinallprojectsfind.h"
@@ -131,7 +132,6 @@
 #include <coreplugin/vcsmanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
-#include <ssh/sshsettings.h>
 #include <texteditor/findinfiles.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditorconstants.h>
@@ -189,7 +189,6 @@
 
 using namespace Core;
 using namespace ProjectExplorer::Internal;
-using namespace QSsh;
 using namespace Utils;
 
 namespace ProjectExplorer {

src/plugins/projectexplorer/projectexplorer.qbs

@@ -6,7 +6,6 @@ Project {
     QtcPlugin {
         Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "qml"] }
         Depends { name: "Aggregation" }
-        Depends { name: "QtcSsh" }
         Depends { name: "Utils" }
 
         Depends { name: "Core" }
@@ -225,6 +224,8 @@ Project {
                 "idevicewidget.h",
                 "localprocesslist.cpp", "localprocesslist.h",
                 "sshdeviceprocesslist.cpp", "sshdeviceprocesslist.h",
+                "sshparameters.cpp", "sshparameters.h",
+                "sshsettings.cpp", "sshsettings.h",
                 "sshsettingspage.cpp", "sshsettingspage.h",
                 "desktopprocesssignaloperation.cpp", "desktopprocesssignaloperation.h"
             ]

src/plugins/projectexplorer/runcontrol.cpp

@@ -29,6 +29,7 @@
 #include "customparser.h"
 #include "devicesupport/desktopdevice.h"
 #include "devicesupport/idevice.h"
+#include "devicesupport/sshsettings.h"
 #include "kitinformation.h"
 #include "project.h"
 #include "projectexplorer.h"
@@ -55,7 +56,8 @@
 #include <utils/utilsicons.h>
 #include <utils/variablechooser.h>
 
-#include <ssh/sshsettings.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/icore.h>
 
 #include <QDir>
 #include <QFormLayout>
@@ -72,7 +74,6 @@
 #endif
 
 using namespace ProjectExplorer::Internal;
-using namespace QSsh;
 using namespace Utils;
 
 namespace {

src/plugins/qnx/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(Qnx
-  DEPENDS QtcSsh QmlDebug Qt5::Xml
+  DEPENDS QmlDebug Qt5::Xml
   PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
   SOURCES
     qnx.qrc

src/plugins/qnx/qnx.qbs

@@ -4,7 +4,6 @@ QtcPlugin {
     name: "Qnx"
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
-    Depends { name: "QtcSsh" }
     Depends { name: "QmlDebug" }
     Depends { name: "Utils" }
 

src/plugins/qnx/qnxdevicewizard.cpp

@@ -27,12 +27,11 @@
 
 #include "qnxconstants.h"
 
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <remotelinux/genericlinuxdeviceconfigurationwizardpages.h>
-#include <ssh/sshparameters.h>
 #include <utils/portlist.h>
 
 using namespace ProjectExplorer;
-using namespace QSsh;
 
 namespace Qnx {
 namespace Internal {

src/plugins/remotelinux/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(RemoteLinux
-  DEPENDS QmlDebug QtcSsh
+  DEPENDS QmlDebug
   PLUGIN_DEPENDS Core Debugger ProjectExplorer
   SOURCES
     abstractpackagingstep.cpp abstractpackagingstep.h

src/plugins/remotelinux/deploymenttimeinfo.cpp

@@ -27,9 +27,9 @@
 
 #include <projectexplorer/deployablefile.h>
 #include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
-#include <ssh/sshparameters.h>
 
 #include <QDateTime>
 

src/plugins/remotelinux/filesystemaccess_test.cpp

@@ -29,7 +29,7 @@
 #include "linuxdevice.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <ssh/sshparameters.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <utils/filepath.h>
 #include <utils/processinterface.h>
 
@@ -40,7 +40,6 @@
 #include <QTimer>
 
 using namespace ProjectExplorer;
-using namespace QSsh;
 using namespace Utils;
 
 namespace RemoteLinux {

src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp

@@ -30,14 +30,13 @@
 
 #include <coreplugin/coreconstants.h>
 #include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <utils/portlist.h>
 #include <utils/fancylineedit.h>
 #include <utils/utilsicons.h>
-#include <ssh/sshparameters.h>
 
 using namespace ProjectExplorer;
 using namespace RemoteLinux;
-using namespace QSsh;
 using namespace Utils;
 
 GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(

src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp

@@ -30,12 +30,11 @@
 #include "remotelinux_constants.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <ssh/sshparameters.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <utils/portlist.h>
 #include <utils/fileutils.h>
 
 using namespace ProjectExplorer;
-using namespace QSsh;
 
 namespace RemoteLinux {
 namespace Internal {

src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp

@@ -29,8 +29,7 @@
 #include "publickeydeploymentdialog.h"
 #include "sshkeycreationdialog.h"
 
-#include <projectexplorer/devicesupport/idevice.h>
-#include <ssh/sshparameters.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <utils/pathchooser.h>
 #include <utils/utilsicons.h>
 
@@ -40,7 +39,7 @@
 #include <QStringList>
 #include <QVBoxLayout>
 
-using namespace QSsh;
+using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace RemoteLinux {

src/plugins/remotelinux/linuxdevice.cpp

@@ -40,11 +40,10 @@
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
+#include <projectexplorer/devicesupport/sshsettings.h>
 #include <projectexplorer/runcontrol.h>
 
-#include <ssh/sshparameters.h>
-#include <ssh/sshsettings.h>
-
 #include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
@@ -65,7 +64,6 @@
 #include <QTimer>
 
 using namespace ProjectExplorer;
-using namespace QSsh;
 using namespace Utils;
 
 namespace RemoteLinux {

src/plugins/remotelinux/publickeydeploymentdialog.cpp

@@ -26,7 +26,7 @@
 #include "publickeydeploymentdialog.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <ssh/sshparameters.h>
+#include <projectexplorer/devicesupport/sshparameters.h>
 #include <utils/qtcprocess.h>
 #include <utils/theme/theme.h>
 

src/plugins/remotelinux/remotelinux.qbs

@@ -5,7 +5,6 @@ Project {
 
     QtcPlugin {
         Depends { name: "Qt.widgets" }
-        Depends { name: "QtcSsh" }
         Depends { name: "QmlDebug" }
         Depends { name: "Utils" }
 
@@ -106,7 +105,6 @@ Project {
         Export {
             Depends { name: "Debugger" }
             Depends { name: "Core" }
-            Depends { name: "QtcSsh" }
         }
     }
 }

src/plugins/remotelinux/sshkeycreationdialog.cpp

@@ -26,7 +26,7 @@
 #include "sshkeycreationdialog.h"
 #include "ui_sshkeycreationdialog.h"
 
-#include <ssh/sshsettings.h>
+#include <projectexplorer/devicesupport/sshsettings.h>
 
 #include <utils/fileutils.h>
 #include <utils/pathchooser.h>
@@ -36,7 +36,7 @@
 #include <QMessageBox>
 #include <QStandardPaths>
 
-using namespace QSsh;
+using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace RemoteLinux {
@@ -138,4 +138,4 @@ FilePath SshKeyCreationDialog::publicKeyFilePath() const
     return FilePath::fromUserInput(m_ui->publicKeyFileLabel->text());
 }
 
-} // namespace QSsh
+} // namespace RemoteLinux

src/plugins/valgrind/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(Valgrind
-  DEPENDS CPlusPlus QtcSsh
+  DEPENDS CPlusPlus
   PLUGIN_DEPENDS Core Debugger ProjectExplorer TextEditor
   SOURCES
     callgrind/callgrindabstractmodel.h

src/plugins/valgrind/valgrind.qbs

@@ -6,7 +6,6 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
     Depends { name: "CPlusPlus"}
-    Depends { name: "QtcSsh" }
     Depends { name: "Utils" }
 
     Depends { name: "Core" }

tests/auto/valgrind/callgrind/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_test(tst_callgrindparsertests
-  DEPENDS Utils QtcSsh Core ProjectExplorer Debugger Qt5::Core Qt5::Network
+  DEPENDS Utils Core ProjectExplorer Debugger Qt5::Core Qt5::Network
   DEFINES
     PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_LIST_DIR}/data"
     CALLGRINDPARSERTESTS

tests/auto/valgrind/valgrindautotest.qbs

@@ -3,7 +3,6 @@ import qbs
 QtcAutotest {
     Depends { name: "Debugger" }
     Depends { name: "Core" }
-    Depends { name: "QtcSsh" }
     Depends { name: "Utils" }
     Depends { name: "ProjectExplorer" }
     property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"