diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-10 11:36:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-10 11:38:40 +0100 |
| commit | 58437fb125f60c11ba8e97c914fa8db8c89c7373 (patch) | |
| tree | f47ed59073984ec76034155bc04d3d987b192d2e /qmake/doc | |
| parent | 76bb804405f424708fffec502788995ea91206b8 (diff) | |
| parent | b20c15f2041205a1cab98fbaf9560a3e2e0d6367 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/serialization/qcborcommon.h
src/corelib/tools/qlocale_data_p.h
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: Ibed987f6d77a0294f78f67d78625237616082416
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 |