From 9db911ae124bf32e42d4c20fb6ad8d404ff37292 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 13 May 2022 01:08:44 +0200 Subject: [PATCH] Get rid of Ssh lib Move the rest to ProjectExplorer plugin. Change-Id: Id2f022359e7e01728779228ea1f7f0b05a81c8e4 Reviewed-by: Christian Kandeler Reviewed-by: --- src/libs/CMakeLists.txt | 1 - src/libs/libs.qbs | 1 - src/libs/ssh/CMakeLists.txt | 7 ---- src/libs/ssh/ssh.qbs | 28 ------------- src/libs/ssh/ssh_global.h | 42 ------------------- src/plugins/android/CMakeLists.txt | 2 +- src/plugins/boot2qt/CMakeLists.txt | 2 +- src/plugins/boot2qt/qdbdevice.cpp | 4 +- src/plugins/clangtools/clangtools.qbs | 1 - src/plugins/debugger/CMakeLists.txt | 2 +- .../debugger/analyzer/startremotedialog.cpp | 3 +- src/plugins/debugger/debugger.qbs | 2 - src/plugins/debugger/debuggerdialogs.cpp | 3 +- src/plugins/debugger/debuggerplugin.cpp | 4 +- src/plugins/projectexplorer/CMakeLists.txt | 4 +- .../devicesupport/deviceusedportsgatherer.cpp | 3 +- .../projectexplorer/devicesupport/idevice.cpp | 10 ++--- .../projectexplorer/devicesupport/idevice.h | 7 ++-- .../devicesupport}/sshparameters.cpp | 10 ++--- .../devicesupport}/sshparameters.h | 30 ++++++------- .../devicesupport}/sshsettings.cpp | 9 ++-- .../devicesupport}/sshsettings.h | 8 ++-- .../devicesupport/sshsettingspage.cpp | 3 +- .../projectexplorer/kitinformation.cpp | 3 +- .../projectexplorer/projectexplorer.cpp | 3 +- .../projectexplorer/projectexplorer.qbs | 3 +- src/plugins/projectexplorer/runcontrol.cpp | 5 ++- src/plugins/qnx/CMakeLists.txt | 2 +- src/plugins/qnx/qnx.qbs | 1 - src/plugins/qnx/qnxdevicewizard.cpp | 3 +- src/plugins/remotelinux/CMakeLists.txt | 2 +- .../remotelinux/deploymenttimeinfo.cpp | 2 +- .../remotelinux/filesystemaccess_test.cpp | 3 +- .../genericlinuxdeviceconfigurationwidget.cpp | 3 +- .../genericlinuxdeviceconfigurationwizard.cpp | 3 +- ...riclinuxdeviceconfigurationwizardpages.cpp | 5 +-- src/plugins/remotelinux/linuxdevice.cpp | 6 +-- .../remotelinux/publickeydeploymentdialog.cpp | 2 +- src/plugins/remotelinux/remotelinux.qbs | 2 - .../remotelinux/sshkeycreationdialog.cpp | 6 +-- src/plugins/valgrind/CMakeLists.txt | 2 +- src/plugins/valgrind/valgrind.qbs | 1 - tests/auto/valgrind/callgrind/CMakeLists.txt | 2 +- tests/auto/valgrind/valgrindautotest.qbs | 1 - 44 files changed, 72 insertions(+), 174 deletions(-) delete mode 100644 src/libs/ssh/CMakeLists.txt delete mode 100644 src/libs/ssh/ssh.qbs delete mode 100644 src/libs/ssh/ssh_global.h rename src/{libs/ssh => plugins/projectexplorer/devicesupport}/sshparameters.cpp (96%) rename src/{libs/ssh => plugins/projectexplorer/devicesupport}/sshparameters.h (74%) rename src/{libs/ssh => plugins/projectexplorer/devicesupport}/sshsettings.cpp (97%) rename src/{libs/ssh => plugins/projectexplorer/devicesupport}/sshsettings.h (94%) diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 9c0f2d68e7e..72658107376 100644 --- a/src/libs/CMakeLists.txt +++ b/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) diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs index 2b1cda7cfc6..92f84fe4d19 100644 --- a/src/libs/libs.qbs +++ b/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", diff --git a/src/libs/ssh/CMakeLists.txt b/src/libs/ssh/CMakeLists.txt deleted file mode 100644 index 87564923cf4..00000000000 --- a/src/libs/ssh/CMakeLists.txt +++ /dev/null @@ -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 -) diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs deleted file mode 100644 index 716434774f5..00000000000 --- a/src/libs/ssh/ssh.qbs +++ /dev/null @@ -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" } } - } -} diff --git a/src/libs/ssh/ssh_global.h b/src/libs/ssh/ssh_global.h deleted file mode 100644 index 0449e664e7e..00000000000 --- a/src/libs/ssh/ssh_global.h +++ /dev/null @@ -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 - -#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 diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt index 2f4b06f634a..5ac673bd4f4 100644 --- a/src/plugins/android/CMakeLists.txt +++ b/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 diff --git a/src/plugins/boot2qt/CMakeLists.txt b/src/plugins/boot2qt/CMakeLists.txt index a2a32346696..9713dc5b7ec 100644 --- a/src/plugins/boot2qt/CMakeLists.txt +++ b/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 diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp index 7f447ad3424..f6c3f6312d7 100644 --- a/src/plugins/boot2qt/qdbdevice.cpp +++ b/src/plugins/boot2qt/qdbdevice.cpp @@ -32,12 +32,11 @@ #include #include +#include #include #include -#include - #include #include #include @@ -48,7 +47,6 @@ #include using namespace ProjectExplorer; -using namespace QSsh; using namespace RemoteLinux; using namespace Utils; diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs index 066b6848c3e..c3683ee17f7 100644 --- a/src/plugins/clangtools/clangtools.qbs +++ b/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" } diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt index 4d7830dcd4f..aeefdec4bb6 100644 --- a/src/plugins/debugger/CMakeLists.txt +++ b/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 diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp index 54cd304cfd6..9ef484f9f97 100644 --- a/src/plugins/debugger/analyzer/startremotedialog.cpp +++ b/src/plugins/debugger/analyzer/startremotedialog.cpp @@ -28,12 +28,11 @@ #include #include +#include #include #include #include -#include - #include #include #include diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 0e4143a6e21..a4f00665849 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/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" } } } diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 827d43e0a06..f65ddd91908 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -33,11 +33,10 @@ #include +#include #include #include -#include - #include #include #include diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index b5c7565747c..8d8c013c206 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -90,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -102,8 +103,6 @@ #include #include -#include - #include #include #include @@ -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; diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 0bfdec0dc5a..ed6686e11a5 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/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 diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp index 02d8599a00b..ead3e521ba4 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp @@ -25,8 +25,9 @@ #include "deviceusedportsgatherer.h" +#include "sshparameters.h" + #include -#include #include #include #include diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 2ee164d5516..2d63f6bbc55 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/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 -#include #include #include #include @@ -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; } diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 8d308825a48..132e8c27194 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/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; diff --git a/src/libs/ssh/sshparameters.cpp b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp similarity index 96% rename from src/libs/ssh/sshparameters.cpp rename to src/plugins/projectexplorer/devicesupport/sshparameters.cpp index d1e26f938e1..8ae238deba5 100644 --- a/src/libs/ssh/sshparameters.cpp +++ b/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 ¶ms) +bool checkParameters(const SshParameters ¶ms) { if (qEnvironmentVariableIsSet("QTC_SSH_TEST_DEFAULTS")) return true; @@ -219,4 +219,4 @@ void printSetupHelp() } // namespace SshTest #endif -} // namespace QSsh +} // namespace ProjectExplorer diff --git a/src/libs/ssh/sshparameters.h b/src/plugins/projectexplorer/devicesupport/sshparameters.h similarity index 74% rename from src/libs/ssh/sshparameters.h rename to src/plugins/projectexplorer/devicesupport/sshparameters.h index 6631bb66831..abf94883bdc 100644 --- a/src/libs/ssh/sshparameters.h +++ b/src/plugins/projectexplorer/devicesupport/sshparameters.h @@ -25,7 +25,7 @@ #pragma once -#include "ssh_global.h" +#include "../projectexplorer_export.h" #include @@ -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 ¶ms); -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 ¶ms); +void PROJECTEXPLORER_EXPORT printSetupHelp(); } // namespace SshTest #endif -} // namespace QSsh +} // namespace ProjectExplorer -Q_DECLARE_METATYPE(QSsh::SshParameters::AuthenticationType) +Q_DECLARE_METATYPE(ProjectExplorer::SshParameters::AuthenticationType) diff --git a/src/libs/ssh/sshsettings.cpp b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp similarity index 97% rename from src/libs/ssh/sshsettings.cpp rename to src/plugins/projectexplorer/devicesupport/sshsettings.cpp index 571ca5c1afa..d0f93e2fb7e 100644 --- a/src/libs/ssh/sshsettings.cpp +++ b/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 diff --git a/src/libs/ssh/sshsettings.h b/src/plugins/projectexplorer/devicesupport/sshsettings.h similarity index 94% rename from src/libs/ssh/sshsettings.h rename to src/plugins/projectexplorer/devicesupport/sshsettings.h index 1b7c4584640..74d246cbb7b 100644 --- a/src/libs/ssh/sshsettings.h +++ b/src/plugins/projectexplorer/devicesupport/sshsettings.h @@ -25,7 +25,7 @@ #pragma once -#include "ssh_global.h" +#include "../projectexplorer_export.h" #include @@ -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 diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp index 288a5f9cb42..451ec0328f2 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp @@ -24,10 +24,10 @@ ****************************************************************************/ #include "sshsettingspage.h" +#include "sshsettings.h" #include #include -#include #include #include @@ -36,7 +36,6 @@ #include #include -using namespace QSsh; using namespace Utils; namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index bcb7131061f..994a21465c9 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/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 -#include - #include #include #include diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index af1212c457a..aab125a0d54 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/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 #include #include -#include #include #include #include @@ -189,7 +189,6 @@ using namespace Core; using namespace ProjectExplorer::Internal; -using namespace QSsh; using namespace Utils; namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index c6f403a8915..f231c7fbdd5 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/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" ] diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 7d5dd61711e..068b5584fa3 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/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 #include -#include +#include +#include #include #include @@ -72,7 +74,6 @@ #endif using namespace ProjectExplorer::Internal; -using namespace QSsh; using namespace Utils; namespace { diff --git a/src/plugins/qnx/CMakeLists.txt b/src/plugins/qnx/CMakeLists.txt index 98d3ed92d2d..8e9342b9e2d 100644 --- a/src/plugins/qnx/CMakeLists.txt +++ b/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 diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index 8cdc6034bc4..fe56430e17e 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/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" } diff --git a/src/plugins/qnx/qnxdevicewizard.cpp b/src/plugins/qnx/qnxdevicewizard.cpp index 9d8a348e2de..292f6946bff 100644 --- a/src/plugins/qnx/qnxdevicewizard.cpp +++ b/src/plugins/qnx/qnxdevicewizard.cpp @@ -27,12 +27,11 @@ #include "qnxconstants.h" +#include #include -#include #include using namespace ProjectExplorer; -using namespace QSsh; namespace Qnx { namespace Internal { diff --git a/src/plugins/remotelinux/CMakeLists.txt b/src/plugins/remotelinux/CMakeLists.txt index 3be6ca59210..9087867ccec 100644 --- a/src/plugins/remotelinux/CMakeLists.txt +++ b/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 diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp index 8eaec77e01e..3dde7d5d2af 100644 --- a/src/plugins/remotelinux/deploymenttimeinfo.cpp +++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp @@ -27,9 +27,9 @@ #include #include +#include #include #include -#include #include diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp index 150a878686a..ca27238b997 100644 --- a/src/plugins/remotelinux/filesystemaccess_test.cpp +++ b/src/plugins/remotelinux/filesystemaccess_test.cpp @@ -29,7 +29,7 @@ #include "linuxdevice.h" #include -#include +#include #include #include @@ -40,7 +40,6 @@ #include using namespace ProjectExplorer; -using namespace QSsh; using namespace Utils; namespace RemoteLinux { diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp index 8c779fda2b8..ef5fcba0fd6 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp @@ -30,14 +30,13 @@ #include #include +#include #include #include #include -#include using namespace ProjectExplorer; using namespace RemoteLinux; -using namespace QSsh; using namespace Utils; GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget( diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp index 511fd22bde7..2c4b7e247e4 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp @@ -30,12 +30,11 @@ #include "remotelinux_constants.h" #include -#include +#include #include #include using namespace ProjectExplorer; -using namespace QSsh; namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp index f7f43d726f7..903aed598e6 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp @@ -29,8 +29,7 @@ #include "publickeydeploymentdialog.h" #include "sshkeycreationdialog.h" -#include -#include +#include #include #include @@ -40,7 +39,7 @@ #include #include -using namespace QSsh; +using namespace ProjectExplorer; using namespace Utils; namespace RemoteLinux { diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index dad3f135fdc..b0881625023 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -40,11 +40,10 @@ #include #include +#include +#include #include -#include -#include - #include #include #include @@ -65,7 +64,6 @@ #include using namespace ProjectExplorer; -using namespace QSsh; using namespace Utils; namespace RemoteLinux { diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index 90a05596b93..d54423f5e5e 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -26,7 +26,7 @@ #include "publickeydeploymentdialog.h" #include -#include +#include #include #include diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index ad5547db13a..d91d412ee3a 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/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" } } } } diff --git a/src/plugins/remotelinux/sshkeycreationdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp index ed616c69a45..cc57f2d24f8 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.cpp +++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp @@ -26,7 +26,7 @@ #include "sshkeycreationdialog.h" #include "ui_sshkeycreationdialog.h" -#include +#include #include #include @@ -36,7 +36,7 @@ #include #include -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 diff --git a/src/plugins/valgrind/CMakeLists.txt b/src/plugins/valgrind/CMakeLists.txt index 83720cb2c0e..9896c93a3a8 100644 --- a/src/plugins/valgrind/CMakeLists.txt +++ b/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 diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index 65573c31415..bee21fdf738 100644 --- a/src/plugins/valgrind/valgrind.qbs +++ b/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" } diff --git a/tests/auto/valgrind/callgrind/CMakeLists.txt b/tests/auto/valgrind/callgrind/CMakeLists.txt index 70a5671caad..72df53a9d40 100644 --- a/tests/auto/valgrind/callgrind/CMakeLists.txt +++ b/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 diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs index 78f546144f1..88b52b61393 100644 --- a/tests/auto/valgrind/valgrindautotest.qbs +++ b/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"