diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-05 19:06:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 19:06:47 +0100 |
| commit | eedb3a06cbaff1a3e100a0d68a578d15a0c9dd97 (patch) | |
| tree | cc9c2677b63d99f87dfd60d7eb0aba138c026d06 /qmake/doc | |
| parent | 73e7eb785fbf984e2b964be8c3acad788479dfa6 (diff) | |
| parent | d24835a60c0c620a27c7a9830b89ed47312739a5 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I12f26470e01a8582d0f02f51e20d5b742bd95d6f
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 0ded8b574a..1a779a94b4 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -3038,6 +3038,7 @@ \snippet code/doc_src_qmake-manual.pro 59 + \target qmake-cat \section2 cat(filename[, mode]) Returns the contents of \c filename. You can specify the following options @@ -3404,6 +3405,10 @@ \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 + (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 variable. If the command crashes, the status will be -1, otherwise a non-negative exit code of the command's choosing. Usually, comparing |