diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-02-06 14:59:51 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-02-06 15:01:52 +0100 |
| commit | 291998afd51ea529d52ca94f4fa79746205dbada (patch) | |
| tree | 61fdec24be77d279f7aba3fd2b9d8ee6a629cce5 /doc | |
| parent | 5b76f22a8af2a7ab87c88d2d1a5197af58db4eef (diff) | |
| parent | aec6c77bb8ce33b6535106c78eeb9cd755398953 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
doc/doc.pri
tests/auto/blackbox/tst_blackbox.cpp
tests/auto/blackbox/tst_blackbox.h
Change-Id: Ic69a6e87ff6f1cf74cb43ec76ac1a6e4a1c02c8d
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qbs-online.qdocconf | 16 | ||||
| -rw-r--r-- | doc/reference/jsextensions/jsextension-process.qdoc | 8 |
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/qbs-online.qdocconf b/doc/qbs-online.qdocconf new file mode 100644 index 000000000..4c21d1e8e --- /dev/null +++ b/doc/qbs-online.qdocconf @@ -0,0 +1,16 @@ +include(config/qbs-project.qdocconf) + +HTML.footer = \ + " </div>\n" \ + " <p class=\"copy-notice\">\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ + " their respective owners. " \ + " The documentation provided herein is licensed under the terms of the" \ + " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ + " License version 1.3</a> as published by the Free Software Foundation. " \ + " Qt and respective logos are trademarks of The Qt Company Ltd " \ + " in Finland and/or other countries worldwide. All other trademarks are property\n" \ + " of their respective owners. </p>\n" + +include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf) diff --git a/doc/reference/jsextensions/jsextension-process.qdoc b/doc/reference/jsextensions/jsextension-process.qdoc index dc700bd99..3df109333 100644 --- a/doc/reference/jsextensions/jsextension-process.qdoc +++ b/doc/reference/jsextensions/jsextension-process.qdoc @@ -102,6 +102,14 @@ \endcode Reads and returns all data from the process' standard output channel. + \section2 setCodec + \code + setCodec(codec) + \endcode + Sets the text codec to \c codec. The codec is used for reading and writing from and to + the process, respectively. The supported codecs are the same as for \c QTextCodec, for example: + "UTF-8", "UTF-16", and "ISO 8859-1". + \section2 setEnv \code setEnv(varName: string, varValue: string): string |