diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-05-12 10:37:42 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-05-12 12:03:12 +0000 |
| commit | 3997b41e0389bcaea8b198aed548c1983759fdba (patch) | |
| tree | e5c92cdf47289c97b2a722feffb6ff9b805ab6f5 /doc | |
| parent | 764e102e63557afdece68077112e70c98f0a8705 (diff) | |
Clean up handling of {Project,Product}.qbsSearchPaths.
The code was redundant and generally much more complicated than it
needed to be.
Note: This change introduces a (backward-compatible) behavior change, as
search paths set in products and child projects no longer overwrite the
respective value from the parent project. The reason for the original
decision was probably to allow exotic use cases like finding a module of
the same name at a different location, but this is still possible, as
the paths deeper in the inheritance tree take precedence.
Change-Id: If2e9b55c2ab6e1b22e57b1b4943ab6b52540a744
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/items/product.qdoc | 4 | ||||
| -rw-r--r-- | doc/reference/items/project.qdoc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/reference/items/product.qdoc b/doc/reference/items/product.qdoc index afbf9b1d8..5205b6e6b 100644 --- a/doc/reference/items/product.qdoc +++ b/doc/reference/items/product.qdoc @@ -155,8 +155,8 @@ \li stringList \li project.qbsSearchPaths \li See the documentation of the \l {Project Item} property of the same name. - Setting this property here will override the default value inherited from - the project, so use the \c concat() function if you want to add something. + The value set here will be merged with the one inherited from + the project. \row \li version \li string diff --git a/doc/reference/items/project.qdoc b/doc/reference/items/project.qdoc index 9ff44dc7a..eba923af1 100644 --- a/doc/reference/items/project.qdoc +++ b/doc/reference/items/project.qdoc @@ -89,8 +89,9 @@ \li stringList \li empty \li These paths are searched for imports and modules in addition to the ones listed - in \c{preferences.qbsSearchPaths}. - All products in the project inherit this value by default. + in \c{preferences.qbsSearchPaths}. The value set here is merged with the value + inherited from the parent project, if there is one. The result is inherited by + all products in the project. \row \li references \li path list |