forked from qt-creator/qt-creator
Deploy related data has been moved from Run-Configuration into Deploy-Configuration. Symbian OS
Reviewed-by: Tobias Hunger
This commit is contained in:
@@ -35,19 +35,27 @@
|
||||
#include "qt-maemo/maemopackagecreationstep.h"
|
||||
#include "qt-s60/s60createpackagestep.h"
|
||||
#include "qt-s60/s60deploystep.h"
|
||||
#include "qt-s60/s60deployconfiguration.h"
|
||||
|
||||
#include <projectexplorer/buildsteplist.h>
|
||||
#include <projectexplorer/target.h>
|
||||
|
||||
using namespace Qt4ProjectManager;
|
||||
using namespace Qt4ProjectManager::Internal;
|
||||
|
||||
Qt4DeployConfigurationFactory::Qt4DeployConfigurationFactory(QObject *parent) :
|
||||
ProjectExplorer::DeployConfigurationFactory(parent)
|
||||
ProjectExplorer::DeployConfigurationFactory(parent),
|
||||
m_s60DeployConfigurationFactory(new S60DeployConfigurationFactory(this))
|
||||
{ }
|
||||
|
||||
ProjectExplorer::DeployConfiguration *Qt4DeployConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &id)
|
||||
{
|
||||
ProjectExplorer::DeployConfiguration *dc = ProjectExplorer::DeployConfigurationFactory::create(parent, id);
|
||||
ProjectExplorer::DeployConfiguration *dc = 0;
|
||||
if (parent->id() == QLatin1String(Constants::S60_DEVICE_TARGET_ID))
|
||||
dc = m_s60DeployConfigurationFactory->create(parent, id);
|
||||
else
|
||||
dc = ProjectExplorer::DeployConfigurationFactory::create(parent, id);
|
||||
|
||||
if (!dc)
|
||||
return 0;
|
||||
|
||||
@@ -63,3 +71,35 @@ ProjectExplorer::DeployConfiguration *Qt4DeployConfigurationFactory::create(Proj
|
||||
|
||||
return dc;
|
||||
}
|
||||
|
||||
bool Qt4DeployConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const
|
||||
{
|
||||
if (parent->id() == Constants::S60_DEVICE_TARGET_ID)
|
||||
return m_s60DeployConfigurationFactory->canRestore(parent, map);
|
||||
else
|
||||
return ProjectExplorer::DeployConfigurationFactory::canRestore(parent, map);
|
||||
}
|
||||
|
||||
ProjectExplorer::DeployConfiguration *Qt4DeployConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
|
||||
{
|
||||
if (parent->id() == Constants::S60_DEVICE_TARGET_ID)
|
||||
return m_s60DeployConfigurationFactory->restore(parent, map);
|
||||
else
|
||||
return ProjectExplorer::DeployConfigurationFactory::restore(parent, map);
|
||||
}
|
||||
|
||||
bool Qt4DeployConfigurationFactory::canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *product) const
|
||||
{
|
||||
if (parent->id() == Constants::S60_DEVICE_TARGET_ID)
|
||||
return m_s60DeployConfigurationFactory->canClone(parent, product);
|
||||
else
|
||||
return ProjectExplorer::DeployConfigurationFactory::canClone(parent, product);
|
||||
}
|
||||
|
||||
ProjectExplorer::DeployConfiguration *Qt4DeployConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *product)
|
||||
{
|
||||
if (parent->id() == Constants::S60_DEVICE_TARGET_ID)
|
||||
return m_s60DeployConfigurationFactory->clone(parent, product);
|
||||
else
|
||||
return ProjectExplorer::DeployConfigurationFactory::clone(parent, product);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user