diff options
| author | hjk <hjk@qt.io> | 2019-01-24 16:39:52 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-01-25 09:57:08 +0000 |
| commit | e6a184fe5c296a3e12591ff9cd9fa4c306c611eb (patch) | |
| tree | 109700790249261e5a8d8ea7a8f588c90aba3380 /src/plugins/projectexplorer/deployconfiguration.h | |
| parent | 49bd5b6c500ff7bda41173be54207c29c21b5055 (diff) | |
ProjectExplorer: Merge Qbs* into DefaultDeployConfigurationFactory
DefaultDeployConfigurationFactory used extra effort to not apply to the
Qbs (Desktop) case, with QbsDeployConfigurationFactory plugging exactly
that hole with essentially the same functionality, which is even the
default of the base class.
The only differences are the display name, which is dropped in this
patch, and the different keys in the .user file, which are updated
with this patch. Note that the display name "Qbs Install" for the
DeployConfiguration stays with this patch whereas a freshly created
one will get the default "Deploy Configuration" name.
Change-Id: I255371d0a0688fbc6303083eb6aa20563e876264
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/deployconfiguration.h')
| -rw-r--r-- | src/plugins/projectexplorer/deployconfiguration.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index fd60277ffee..143241a6ee8 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -119,9 +119,6 @@ class DefaultDeployConfigurationFactory : public DeployConfigurationFactory { public: DefaultDeployConfigurationFactory(); - -private: - bool canHandle(Target *parent) const override; }; } // namespace ProjectExplorer |