From 60bb956861dd20460c28639a0c25ad9dd19f5c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= Date: Tue, 12 Feb 2013 11:42:11 +0100 Subject: QNX: Make the deploy information unique for each deploy configuration Without this fix, the deploy information was shared between configurations, causing e.g. BAR packages for a device to be overwritten by BAR packages for the simulator. Change-Id: I6b74ba355363060ef53dceac478f0aff0f60c38b Reviewed-by: Mehdi Fekari Reviewed-by: Christian Kandeler Reviewed-by: Nicolas Arnaud-Cormos --- src/plugins/qnx/blackberrydeployconfiguration.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/plugins/qnx/blackberrydeployconfiguration.cpp') diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp index 37875266ba..08040da227 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.cpp +++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp @@ -70,13 +70,7 @@ BlackBerryDeployConfiguration::BlackBerryDeployConfiguration(ProjectExplorer::Ta void BlackBerryDeployConfiguration::ctor() { - BlackBerryDeployInformation *info - = qobject_cast(target()->project()->namedSettings(QLatin1String(DEPLOYMENT_INFO_SETTING)).value()); - if (!info) { - info = new BlackBerryDeployInformation(static_cast(target()->project())); - QVariant data = QVariant::fromValue(static_cast(info)); - target()->project()->setNamedSettings(QLatin1String(DEPLOYMENT_INFO_SETTING), data); - } + m_deployInformation = new BlackBerryDeployInformation(target()); connect(target()->project(), SIGNAL(proFilesEvaluated()), this, SLOT(setupBarDescriptor()), Qt::UniqueConnection); @@ -157,9 +151,7 @@ BlackBerryDeployConfiguration::~BlackBerryDeployConfiguration() BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() const { - BlackBerryDeployInformation *info - = qobject_cast(target()->project()->namedSettings(QLatin1String(DEPLOYMENT_INFO_SETTING)).value()); - return info; + return m_deployInformation; } ProjectExplorer::NamedWidget *BlackBerryDeployConfiguration::createConfigWidget() -- cgit v1.2.1