diff options
| author | hjk <hjk@qt.io> | 2019-01-16 11:07:04 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-01-18 08:50:24 +0000 |
| commit | bc239e240e0d1ab2c615ed0387a3d77fc4fc2ec9 (patch) | |
| tree | 17e7ca242dbecb63ed0206ecc693c3fe717c28a2 /src/plugins/projectexplorer/deployconfiguration.h | |
| parent | 8ec2eb87a4d82712cd8e5a4afb1b41014d2ab97f (diff) | |
Merge DeployConfigurationFactory::{canHandle,canOffer}
Previous uses of canOffer are effectively unchanged in behavior,
other plain uses of canHandle now also check the additional
requirements on the Qt version on Android (the only platform
that had a custom hasBuildTarget() implementation). This is
assumed to make no difference in practice.
Change-Id: If12895d1421d5565ff91a18bf4d7df96c8191160
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/deployconfiguration.h')
| -rw-r--r-- | src/plugins/projectexplorer/deployconfiguration.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 38655c14fc6..8f2ea2bb407 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -85,7 +85,6 @@ public: // the name to display to the user QString defaultDisplayName() const; - bool canOffer(Target *parent) const; bool canCreate(Target *parent, Core::Id id) const; virtual DeployConfiguration *create(Target *parent, Core::Id id); @@ -97,10 +96,9 @@ public: void setDefaultDisplayName(const QString &defaultDisplayName); void setSupportedProjectType(Core::Id id); -protected: virtual bool canHandle(ProjectExplorer::Target *target) const; - virtual bool hasAvailableBuildTargets(Target *parent) const; +protected: using DeployConfigurationCreator = std::function<DeployConfiguration *(Target *)>; template <class DeployConfig> |