From d37ee4d1ab30ce10e9f1bcc0e0a227bdfb2294c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= <tobias.naetterlund.qnx@kdab.com>
Date: Thu, 25 Oct 2012 19:03:14 +0200
Subject: [PATCH] QNX: Add bar-descriptor.xml to new project, and make sure it
shows up in project tree
Change-Id: I41bc5f442977669120cf6b8a315d7bcf481b7f9d
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
src/plugins/qnx/blackberrydeployconfiguration.cpp | 2 ++
src/plugins/qnx/blackberrydeployconfiguration.h | 4 +++-
src/plugins/qnx/blackberrydeployconfigurationfactory.cpp | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp
index 4bee5328885..ccdd84640af 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.cpp
+++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp
@@ -77,6 +77,8 @@ void BlackBerryDeployConfiguration::ctor()
target()->project()->setNamedSettings(QLatin1String(DEPLOYMENT_INFO_SETTING), data);
}
+ connect(target()->project(), SIGNAL(proFilesEvaluated()), this, SLOT(setupBarDescriptor()), Qt::UniqueConnection);
+
setDefaultDisplayName(tr("Deploy to BlackBerry Device"));
}
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.h b/src/plugins/qnx/blackberrydeployconfiguration.h
index c6238eb27b4..24ca2145c19 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.h
+++ b/src/plugins/qnx/blackberrydeployconfiguration.h
@@ -61,9 +61,11 @@ public:
protected:
BlackBerryDeployConfiguration(ProjectExplorer::Target *parent, BlackBerryDeployConfiguration *source);
+private slots:
+ void setupBarDescriptor();
+
private:
void ctor();
- void setupBarDescriptor();
void addBarDescriptorToProject(const QString& barDescriptorPath);
};
diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
index f3a64af0bff..9579f28f3a7 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
+++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
@@ -92,7 +92,6 @@ ProjectExplorer::DeployConfiguration *BlackBerryDeployConfigurationFactory::crea
return 0;
BlackBerryDeployConfiguration *dc = new BlackBerryDeployConfiguration(parent);
- dc->setupBarDescriptor();
dc->stepList()->insertStep(0, new BlackBerryCreatePackageStep(dc->stepList()));
dc->stepList()->insertStep(1, new BlackBerryDeployStep(dc->stepList()));
return dc;
--
GitLab