diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-12-15 15:28:25 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-12-15 15:28:25 +0100 |
| commit | 7f4cb03df4c06d6b2e3cdb8ae81613d376f4f221 (patch) | |
| tree | 202a1f8fc23367cdfd80aeb59d40c6c6acb17dab /doc | |
| parent | f84c381c12832709b2027dc7b354ca2a322bb80c (diff) | |
| parent | 7338664971101a76a54fda7196c411f0235186c0 (diff) | |
Merge 1.4 into master.
Change-Id: Id67a9d50695cab318b06bbf252bcf7368c0530a5
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qbs.qdoc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index 460833ec6..b8d896910 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -421,8 +421,7 @@ \endcode A module can implicitly depend on other modules. For example, the \c Qt.core module depends - on \c{cpp}. But to set the properties of a module you must explicitly import - it. + on \c{cpp}. But to set the properties of a module you must make the dependency explicit. \code // THIS DOES NOT WORK @@ -466,8 +465,8 @@ \section2 Selecting Files by Properties - The classical (pre-lighthouse) Qt case is that you have a file that is only going to - be compiled on a certain platform. This is how you do it: + Sometimes you have a file that is only going to be compiled on a certain platform. + This is how you do it: \code Group { condition: qbs.targetOS.contains("windows") |