From 637ce777d3d9764cec201673c352695e8cd4ecc0 Mon Sep 17 00:00:00 2001 From: El Mehdi Fekari Date: Tue, 21 May 2013 12:00:58 +0200 Subject: Qnx: Set the correct target name in the application descriptor In some cases, when deploying an exising project, the project name is different from the target name set on the pro file. Change-Id: I558a128467eb12a6d9d3731f563276bb54a14326 Reviewed-by: Tobias Hunger --- src/plugins/qnx/blackberrydeployconfiguration.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/plugins/qnx/blackberrydeployconfiguration.cpp') diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp index 4d1f38641d..734e00d09f 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.cpp +++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp @@ -91,6 +91,16 @@ void BlackBerryDeployConfiguration::setupBarDescriptor() Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(target()->kit()); QString projectName = target()->project()->displayName(); + QString targetName; + Qt4ProjectManager::Qt4Project *project = static_cast(target()->project()); + foreach (Qt4ProjectManager::Qt4ProFileNode *node, project->applicationProFiles()) { + QString target = node->targetInformation().target; + if (!target.isEmpty()) { + targetName = target; + break; + } + } + if (deviceType == Constants::QNX_BB_OS_TYPE) { const QLatin1String barDescriptorFileName("bar-descriptor.xml"); Utils::FileName barDescriptorPath = Utils::FileName::fromString(target()->project()->projectDirectory()).appendPath(barDescriptorFileName); @@ -130,7 +140,7 @@ void BlackBerryDeployConfiguration::setupBarDescriptor() QString content = QString::fromUtf8(reader.data()); content.replace(QLatin1String("PROJECTNAME"), projectName); - content.replace(QLatin1String("PROJECTPATH"), projectName); + content.replace(QLatin1String("PROJECTPATH"), targetName); content.replace(QLatin1String("ID"), QLatin1String("com.example.") + projectName); if (Utils::FileName::fromString(target()->project()->projectDirectory()) -- cgit v1.2.1