aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/api
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-10-17 10:47:06 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-11-07 15:56:33 +0000
commit8ca922793f2a7a10023784d1c18e4b86f552209d (patch)
tree5150fddc8c4fb0e79fc41f65af210feb41a67c38 /src/lib/corelib/api
parent98e4cef3ea23842d6bceb438e0f1f8285a01d979 (diff)
Enable modules to declare target artifacts
Such artifacts appear to rules just like target artifacts of products. This functionality will be useful for auto-generating qbs modules from products. [ChangeLog] Modules can now declare target artifacts using the new filesAreTargets property of the Group item. Task-number: QBS-882 Change-Id: I3bba000be9a1057d9fef01e5576363719ff1f244 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/api')
-rw-r--r--src/lib/corelib/api/project.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index f9d4f43d8..648022b32 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -790,8 +790,10 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
product.d->isMultiplexed = productIsMultiplexed(resolvedProduct);
product.d->properties = resolvedProduct->productProperties;
product.d->moduleProperties.d->m_map = resolvedProduct->moduleProperties;
- for (const GroupPtr &resolvedGroup : qAsConst(resolvedProduct->groups))
- product.d->groups << createGroupDataFromGroup(resolvedGroup, resolvedProduct);
+ for (const GroupPtr &resolvedGroup : qAsConst(resolvedProduct->groups)) {
+ if (resolvedGroup->targetOfModule.isEmpty())
+ product.d->groups << createGroupDataFromGroup(resolvedGroup, resolvedProduct);
+ }
if (resolvedProduct->enabled) {
QBS_CHECK(resolvedProduct->buildData);
const ArtifactSet targetArtifacts = resolvedProduct->targetArtifacts();