Commit c3d55594 authored by hjk's avatar hjk

RemoteLinux: Don't check toolchains to enable deploy steps

That can be too restrictive.

Change-Id: Iedaa6ce0f97c424efbe4046ce13c05025b222523
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent f3c62005
......@@ -55,18 +55,17 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory(QOb
: DeployConfigurationFactory(parent)
{ setObjectName(QLatin1String("RemoteLinuxDeployConfiguration"));}
QList<Core::Id> RemoteLinuxDeployConfigurationFactory::availableCreationIds(Target *parent) const
QList<Core::Id> RemoteLinuxDeployConfigurationFactory::availableCreationIds(Target *target) const
{
QList<Core::Id> ids;
if (!parent->project()->supportsKit(parent->kit()))
if (!target->project()->supportsKit(target->kit()))
return ids;
ProjectExplorer::ToolChain *tc
= ProjectExplorer::ToolChainKitInformation::toolChain(parent->kit());
if (!tc || tc->targetAbi().os() != ProjectExplorer::Abi::LinuxOS)
const Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(target->kit());
if (deviceType != RemoteLinux::Constants::GenericLinuxOsType)
return ids;
const Core::Id devType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(parent->kit());
if (devType == Constants::GenericLinuxOsType)
ids << genericDeployConfigurationId();
ids << genericDeployConfigurationId();
return ids;
}
......
......@@ -41,7 +41,7 @@ class RemoteLinuxDeployConfigurationFactory : public ProjectExplorer::DeployConf
public:
explicit RemoteLinuxDeployConfigurationFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *target) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment