aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-04-15 15:52:48 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-04-16 11:17:26 +0200
commitd17948b43226559626f00e1b7e377a4f8c51b00a (patch)
tree3ca76f207525a255e22bc21e57f39b651d3f06bd
parent6c64c84c7fd22f82d4ed423d57889a65e72097b8 (diff)
Make build directory available in the API.v0.3.0
Task-number: QBS-261 Change-Id: I78623f6d49d192aeaefead38b9ed16c183b66620 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/lib/api/project.cpp1
-rw-r--r--src/lib/api/projectdata.cpp7
-rw-r--r--src/lib/api/projectdata.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/api/project.cpp b/src/lib/api/project.cpp
index dc5e55819..09fcf154c 100644
--- a/src/lib/api/project.cpp
+++ b/src/lib/api/project.cpp
@@ -201,6 +201,7 @@ ResolvedProductPtr ProjectPrivate::internalProduct(const ProductData &product) c
void ProjectPrivate::retrieveProjectData()
{
m_projectData.m_location = internalProject->location;
+ m_projectData.m_buildDir = internalProject->buildDirectory;
foreach (const ResolvedProductConstPtr &resolvedProduct, internalProject->products) {
ProductData product;
product.m_name = resolvedProduct->name;
diff --git a/src/lib/api/projectdata.cpp b/src/lib/api/projectdata.cpp
index d6c479623..f228f997b 100644
--- a/src/lib/api/projectdata.cpp
+++ b/src/lib/api/projectdata.cpp
@@ -313,11 +313,16 @@ bool operator!=(const PropertyMap &pm1, const PropertyMap &pm2)
*/
/*!
- * \fn QString ProjectData::qbsFilePath() const
+ * \fn CodeLocation ProjectData::location() const
* \brief The qbs source file in which the project is defined.
*/
/*!
+ * \fn QString ProjectData::buildDirectory() const
+ * \brief The base directory under which the build artifacts of this project will be created.
+ */
+
+/*!
* \fn QList<ProductData> ProjectData::products() const
* \brief The products in this project.
*/
diff --git a/src/lib/api/projectdata.h b/src/lib/api/projectdata.h
index 71e140d5d..e16678a21 100644
--- a/src/lib/api/projectdata.h
+++ b/src/lib/api/projectdata.h
@@ -142,11 +142,13 @@ public:
ProjectData();
CodeLocation location() const { return m_location; }
+ QString buildDirectory() const { return m_buildDir; }
QList<ProductData> products() const { return m_products; }
private:
CodeLocation m_location;
QList<ProductData> m_products;
+ QString m_buildDir;
};
QBS_EXPORT bool operator==(const ProjectData &lhs, const ProjectData &rhs);