diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-02 12:51:29 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-09 12:28:32 +0200 |
| commit | 63174f2538c61407d61df48840ed9f7062f3ae0f (patch) | |
| tree | ae15f7691eeb17cf75dcc052693c2a7331b8e0bf /doc/reference | |
| parent | abd6dad9f0e0f94a32ada3116e7ebf4da830d23b (diff) | |
Introduce new project/product property "qbsSearchPaths".
This extends preferences.qbsPath and allows to use project-specific
imports. It also deprecates the "moduleSearchPaths" property, which
becomes redundant now.
Change-Id: I66ff8aa57f6b2657211e3f4541909b2572c6d613
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/items/product.qdoc | 10 | ||||
| -rw-r--r-- | doc/reference/items/project.qdoc | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/doc/reference/items/product.qdoc b/doc/reference/items/product.qdoc index 814bd1266..3172e06c9 100644 --- a/doc/reference/items/product.qdoc +++ b/doc/reference/items/product.qdoc @@ -118,12 +118,12 @@ \li If true, a console application is generated. If false, a GUI application is generated. Only takes effect on Windows. \row - \li moduleSearchPaths + \li qbsSearchPaths \li stringList - \li \c project.moduleSearchPaths - \li The paths that are searched when looking for a module this product depends on. - For more information, see \l{Project Item}. Setting this - property here will overwrite the default value inherited from the project. + \li project.qbsSearchPaths + \li See the documentation of the \l {Project Item} property of the same name. + Setting this property here will overwrite the default value inherited from + the project, so use the \c concat() function if you want to add something. \endtable The following properties are automatically set by qbs and usually are not changed by the user: diff --git a/doc/reference/items/project.qdoc b/doc/reference/items/project.qdoc index 9280ba4b0..5d8ca35cc 100644 --- a/doc/reference/items/project.qdoc +++ b/doc/reference/items/project.qdoc @@ -73,14 +73,12 @@ \li Whether the project is enabled. If false, no products or sub-projects will be collected. \row - \li moduleSearchPaths + \li qbsSearchPaths \li stringList \li empty - \li The paths that are searched when looking for a module a product depends on. + \li These paths are searched for imports and modules in addition to the ones listed + in \c{preferences.qbsPath}. All products in the project inherit this value by default. - In addition to what is given here, Qbs will also look in the directory where - the Qbs file defining this project is located, as well as in the paths - listed in the \c preferences.qbsPath setting. \row \li references \li path list |