diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-13 01:00:10 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-13 01:00:11 +0100 |
commit | ad4f359f805cdb1f1ed4745165090cccfcf11441 (patch) | |
tree | b6526cb215f2d15fd312a48f70798459dd6051b3 /qmake | |
parent | d20c9805763ab3dc504ebf2cefd33499d89ef22c (diff) | |
parent | 69f6d3bd44e4e2d36ef741a1914227f804504141 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I0fe623517af28e408b642c879efd59f633ab63ac
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 645422050b..f99ebbec00 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -3428,7 +3428,7 @@ \snippet code/doc_src_qmake-manual.pro 72 Like \l {qmake-cat}{$$cat()}, the \a mode argument takes \c blob, \c lines, - \c true, and \false as value. However, the legacy word splitting rules + \c true, and \c false as value. However, the legacy word splitting rules (i.e. empty or \c true, and \c false) differ subtly. If you pass \c stsvar, the command's exit status will be stored in that |