diff options
author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-12-07 11:53:16 +0100 |
---|---|---|
committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-12-07 14:00:35 +0000 |
commit | 838e91d47b3e6c2e022cde30b53001460dca9a31 (patch) | |
tree | 6aa0248e801844c41bf95f83427966a2be067236 | |
parent | 4d5ab1c8d95cc107b2cb1603e9e3dc27f1e7f8aa (diff) | |
download | qbs-838e91d47b3e6c2e022cde30b53001460dca9a31.tar.gz |
JSON API: use fullDisplayName in dependencies array
Change the dependencies array to use the product full display name
instead of just the name. That allows clients to search for the
multiplexed products using the dependencies json array of the aggregate
product. Clients are then able to properly update the search path of
the dynamic libraries generated in the multiplexed products.
Change-Id: I3dd8b66e2cb637e501cbfe29c670c57c2cea5f7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | doc/appendix/json-api.qdoc | 4 | ||||
-rw-r--r-- | src/lib/corelib/api/project.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/appendix/json-api.qdoc b/doc/appendix/json-api.qdoc index 959b30bb7..78e359017 100644 --- a/doc/appendix/json-api.qdoc +++ b/doc/appendix/json-api.qdoc @@ -628,8 +628,8 @@ \row \li version \li string \endtable - The \c dependencies are the names of products that occur in the (enabled) - \l Depends items of this product. + The elements of the \c dependencies array correspond to the full-display-name + properties of the products that this product has pulled in via \l Depends items. The \c generated-artifacts are files that are created by the \l{Rule}{rules} in this product. diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp index e6caf1b2b..65b9b4efa 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -697,7 +697,7 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData, } for (const ResolvedProductPtr &resolvedDependentProduct : qAsConst(resolvedProduct->dependencies)) { - product.d->dependencies << resolvedDependentProduct->name; // FIXME: Shouldn't this be a unique name? + product.d->dependencies << resolvedDependentProduct->fullDisplayName(); } std::sort(product.d->type.begin(), product.d->type.end()); std::sort(product.d->groups.begin(), product.d->groups.end()); |