diff options
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index 77cca9909a..fa0150fec5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -57,7 +57,6 @@ using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; namespace { -const char S60_DC_ID[] = "Qt4ProjectManager.S60DeployConfiguration"; const char S60_DC_PREFIX[] = "Qt4ProjectManager.S60DeployConfiguration."; const char SERIAL_PORT_NAME_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.SerialPortName"; @@ -81,7 +80,7 @@ QString pathFromId(const QString &id) // ======== S60DeployConfiguration S60DeployConfiguration::S60DeployConfiguration(Target *parent) : - DeployConfiguration(parent, QLatin1String(S60_DC_ID)), + DeployConfiguration(parent, QLatin1String(S60_DEPLOYCONFIGURATION_ID)), m_activeBuildConfiguration(0), #ifdef Q_OS_WIN m_serialPortName(QLatin1String("COM5")), @@ -479,18 +478,18 @@ DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, const return dc; } -bool S60DeployConfigurationFactory::canCreate(Target *parent, const QString& /*id*/) const +bool S60DeployConfigurationFactory::canCreate(Target *parent, const QString& id) const { Qt4SymbianTarget * t = qobject_cast<Qt4SymbianTarget *>(parent); - if (!t || t->id() != QLatin1String(Constants::S60_DEVICE_TARGET_ID)) + if (!t || t->id() != QLatin1String(Constants::S60_DEVICE_TARGET_ID) + || !id.startsWith(QLatin1String(S60_DEPLOYCONFIGURATION_ID))) return false; return true; } -bool S60DeployConfigurationFactory::canRestore(Target *parent, const QVariantMap& /*map*/) const +bool S60DeployConfigurationFactory::canRestore(Target *parent, const QVariantMap& map) const { - Qt4SymbianTarget * t = qobject_cast<Qt4SymbianTarget *>(parent); - return t && t->id() == QLatin1String(Constants::S60_DEVICE_TARGET_ID); + return canCreate(parent, idFromMap(map)); } DeployConfiguration *S60DeployConfigurationFactory::restore(Target *parent, const QVariantMap &map) @@ -510,7 +509,7 @@ bool S60DeployConfigurationFactory::canClone(Target *parent, DeployConfiguration { if (!qobject_cast<Qt4SymbianTarget *>(parent)) return false; - return source->id() == QLatin1String(S60_DC_ID); + return source->id() == QLatin1String(S60_DEPLOYCONFIGURATION_ID); } DeployConfiguration *S60DeployConfigurationFactory::clone(Target *parent, DeployConfiguration *source) |