summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmaketarget.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-03-09 12:07:35 +0100
committerChristian Kandeler <christian.kandeler@nokia.com>2011-03-09 13:10:19 +0100
commit439b45618ec721568a5fee73789913c2f969578c (patch)
tree61a9f76e54a4cec0a632dd23e0795a52f8910c0e /src/plugins/cmakeprojectmanager/cmaketarget.cpp
parent9be947bd1be8dd2decea535401edb8301e247fbf (diff)
downloadqt-creator-439b45618ec721568a5fee73789913c2f969578c.tar.gz
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.
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmaketarget.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmaketarget.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmaketarget.cpp b/src/plugins/cmakeprojectmanager/cmaketarget.cpp
index 655173f4c3..c2fd68f0a6 100644
--- a/src/plugins/cmakeprojectmanager/cmaketarget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketarget.cpp
@@ -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();