forked from qt-creator/qt-creator
Start making the Maemo support more generic.
This includes:
- decoupling deploy configurations from targets (Reviewed-by: dt)
- adding a "Generic Linux" device type
- splitting up the Maemo deployment step into small pieces that
can be combined in different ways (and much more easily maintained)
- adding a new version handler for pro.user files
(Reviewed-by: Tobias Hunger)
Also:
- Add and use an SSH manager class for easier connection sharing.
- Make the SSH connection parameters a fixed attribute of the connection.
This commit is contained in:
@@ -65,8 +65,7 @@ QString displayNameForId(const QString &id) {
|
||||
|
||||
CMakeTarget::CMakeTarget(CMakeProject *parent) :
|
||||
ProjectExplorer::Target(parent, QLatin1String(DEFAULT_CMAKE_TARGET_ID)),
|
||||
m_buildConfigurationFactory(new CMakeBuildConfigurationFactory(this)),
|
||||
m_deployConfigurationFactory(new ProjectExplorer::DeployConfigurationFactory(this))
|
||||
m_buildConfigurationFactory(new CMakeBuildConfigurationFactory(this))
|
||||
{
|
||||
setDefaultDisplayName(displayNameForId(id()));
|
||||
setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
|
||||
@@ -102,11 +101,6 @@ CMakeBuildConfigurationFactory *CMakeTarget::buildConfigurationFactory() const
|
||||
return m_buildConfigurationFactory;
|
||||
}
|
||||
|
||||
ProjectExplorer::DeployConfigurationFactory *CMakeTarget::deployConfigurationFactory() const
|
||||
{
|
||||
return m_deployConfigurationFactory;
|
||||
}
|
||||
|
||||
QString CMakeTarget::defaultBuildDirectory() const
|
||||
{
|
||||
return cmakeProject()->defaultBuildDirectory();
|
||||
@@ -228,7 +222,7 @@ CMakeTarget *CMakeTargetFactory::create(ProjectExplorer::Project *parent, const
|
||||
|
||||
t->addBuildConfiguration(bc);
|
||||
|
||||
t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
|
||||
t->addDeployConfiguration(t->createDeployConfiguration(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
|
||||
|
||||
t->updateRunConfigurations();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user