diff options
author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-03-09 12:07:35 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-03-09 13:10:19 +0100 |
commit | 439b45618ec721568a5fee73789913c2f969578c (patch) | |
tree | 61a9f76e54a4cec0a632dd23e0795a52f8910c0e /src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp | |
parent | 9be947bd1be8dd2decea535401edb8301e247fbf (diff) | |
download | qt-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/qt4projectmanager/qt-maemo/maemomanager.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp index 0fbd115f19..fb645df973 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp @@ -34,6 +34,7 @@ #include "maemomanager.h" #include "maemoconstants.h" +#include "maemodeployable.h" #include "maemodeploystepfactory.h" #include "maemodeviceconfigurations.h" #include "maemoglobal.h" @@ -43,6 +44,7 @@ #include "maemorunfactories.h" #include "maemosettingspages.h" #include "maemotoolchain.h" +#include "qt4maemodeployconfiguration.h" #include "qt4maemotargetfactory.h" #include "qt4projectmanager/qtversionmanager.h" #include "qt4projectmanager/qt4projectmanagerconstants.h" @@ -65,6 +67,7 @@ MaemoManager::MaemoManager() : QObject(0) , m_runControlFactory(new MaemoRunControlFactory(this)) , m_runConfigurationFactory(new MaemoRunConfigurationFactory(this)) + , m_deployConfigurationFactory(new Qt4MaemoDeployConfigurationFactory(this)) , m_packageCreationFactory(new MaemoPackageCreationFactory(this)) , m_deployStepFactory(new MaemoDeployStepFactory(this)) , m_deviceConfigurationsSettingsPage(new MaemoDeviceConfigurationsSettingsPage(this)) @@ -83,12 +86,15 @@ MaemoManager::MaemoManager() pluginManager->addObject(m_toolChainFactory); pluginManager->addObject(m_runControlFactory); pluginManager->addObject(m_runConfigurationFactory); + pluginManager->addObject(m_deployConfigurationFactory); pluginManager->addObject(m_packageCreationFactory); pluginManager->addObject(m_deployStepFactory); pluginManager->addObject(m_deviceConfigurationsSettingsPage); pluginManager->addObject(m_qemuSettingsPage); pluginManager->addObject(m_publishingFactoryFremantleFree); pluginManager->addObject(m_maemoTargetFactory); + + qRegisterMetaType<MaemoDeployable>("MaemoDeployable"); } MaemoManager::~MaemoManager() @@ -100,6 +106,7 @@ MaemoManager::~MaemoManager() pluginManager->removeObject(m_deviceConfigurationsSettingsPage); pluginManager->removeObject(m_deployStepFactory); pluginManager->removeObject(m_packageCreationFactory); + pluginManager->removeObject(m_deployConfigurationFactory); pluginManager->removeObject(m_runConfigurationFactory); pluginManager->removeObject(m_runControlFactory); pluginManager->removeObject(m_toolChainFactory); |