diff options
| author | Tobias Nätterlund <tobias.naetterlund.qnx@kdab.com> | 2013-02-12 11:42:11 +0100 |
|---|---|---|
| committer | Nicolas Arnaud-Cormos <nicolas@kdab.com> | 2013-02-14 14:41:06 +0100 |
| commit | 60bb956861dd20460c28639a0c25ad9dd19f5c50 (patch) | |
| tree | 1a6d167ac874911435e72ae1123de292ed8e4d16 /src/plugins/qnx/blackberrydeployconfiguration.cpp | |
| parent | ff8594fa60cef1697064c7519a713a0a319e6681 (diff) | |
| download | qt-creator-60bb956861dd20460c28639a0c25ad9dd19f5c50.tar.gz | |
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 <mfekari@rim.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src/plugins/qnx/blackberrydeployconfiguration.cpp')
| -rw-r--r-- | src/plugins/qnx/blackberrydeployconfiguration.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
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<BlackBerryDeployInformation *>(target()->project()->namedSettings(QLatin1String(DEPLOYMENT_INFO_SETTING)).value<QObject *>()); - if (!info) { - info = new BlackBerryDeployInformation(static_cast<Qt4ProjectManager::Qt4Project *>(target()->project())); - QVariant data = QVariant::fromValue(static_cast<QObject *>(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<BlackBerryDeployInformation *>(target()->project()->namedSettings(QLatin1String(DEPLOYMENT_INFO_SETTING)).value<QObject *>()); - return info; + return m_deployInformation; } ProjectExplorer::NamedWidget *BlackBerryDeployConfiguration::createConfigWidget() |