From 03ffc4eaf54b19e73b3a855da314484d428f4640 Mon Sep 17 00:00:00 2001
From: El Mehdi Fekari <mfekari@blackberry.com>
Date: Wed, 23 Apr 2014 18:02:42 +0200
Subject: QNX: Use one single bar descriptor when deploying

No more generated bar descriptor file. The default bar descriptor
should be the same one used when packaging and all changes
should be visible to the user.

Change-Id: Ib0eb1dc2ad2d49e159fa1b6009bac2e0d2569c5a
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
---
 src/plugins/qnx/blackberrycreatepackagestep.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/plugins/qnx/blackberrycreatepackagestep.h')

diff --git a/src/plugins/qnx/blackberrycreatepackagestep.h b/src/plugins/qnx/blackberrycreatepackagestep.h
index 40d0618e8f..0a644f4aa4 100644
--- a/src/plugins/qnx/blackberrycreatepackagestep.h
+++ b/src/plugins/qnx/blackberrycreatepackagestep.h
@@ -45,6 +45,7 @@ class BlackBerryCreatePackageStep : public BlackBerryAbstractDeployStep
 {
     Q_OBJECT
     friend class BlackBerryCreatePackageStepFactory;
+    friend class BarDescriptorFileNodeManager;
 
 public:
     enum PackageMode {
@@ -58,6 +59,12 @@ public:
         DeployedQt
     };
 
+    enum EditMode {
+        PlaceHolders = 0x01,
+        QtEnvironment = 0x02
+    };
+    Q_DECLARE_FLAGS(EditModes, EditMode)
+
     explicit BlackBerryCreatePackageStep(ProjectExplorer::BuildStepList *bsl);
 
     bool init();
@@ -84,6 +91,7 @@ public slots:
 
     void setBundleMode(BundleMode bundleMode);
     void setQtLibraryPath(const QString &qtLibraryPath);
+    void updateAppDescriptorFile();
 
 signals:
     void cskPasswordChanged(QString);
@@ -97,8 +105,10 @@ protected:
 private:
     void ctor();
 
-    bool prepareAppDescriptorFile(const QString &appDescriptorPath, const QString &preparedFilePath);
-    QString fullQtLibraryPath() const;
+    bool doUpdateAppDescriptorFile(const QString &appDescriptorPath,
+                                   QFlags<EditMode> types);
+
+    QString fullDeployedQtLibraryPath() const;
 
     PackageMode m_packageMode;
     QString m_cskPassword;
@@ -111,4 +121,6 @@ private:
 } // namespace Internal
 } // namespace Qnx
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(Qnx::Internal::BlackBerryCreatePackageStep::EditModes)
+
 #endif // QNX_INTERNAL_BLACKBERRYCREATEPACKAGESTEP_H
-- 
cgit v1.2.1