diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-04 20:27:42 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-12-04 20:27:42 +0000 |
| commit | 397b8dd22bb35b6d68b3b303ad13fd40f6634670 (patch) | |
| tree | f54971def0d80034389b15045be9ec22f121107f /doc | |
| parent | 3f7621fea74da37a38514131f9b90b026896c42c (diff) | |
| parent | 70a833b5d5f39a2e37e3aab50507999282cf24e5 (diff) | |
| download | qbs-397b8dd22bb35b6d68b3b303ad13fd40f6634670.tar.gz | |
Merge "Merge 1.10 into master"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/innosetup-module.qdoc | 6 | ||||
| -rw-r--r-- | doc/reference/modules/nsis-module.qdoc | 6 | ||||
| -rw-r--r-- | doc/reference/modules/wix-module.qdoc | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/doc/reference/modules/innosetup-module.qdoc b/doc/reference/modules/innosetup-module.qdoc index 7f86ed072..416ccb89b 100644 --- a/doc/reference/modules/innosetup-module.qdoc +++ b/doc/reference/modules/innosetup-module.qdoc @@ -157,5 +157,11 @@ \li 1.7 \li The rule that creates Inno Setup executable files attaches this tag (as well as the "application" tag) to its output artifact. + \row + \li \c{"innosetup.input"} + \li n/a + \li 1.10 + \li The rule that creates Inno Setup executable files will be dependent on artifacts + with this tag. \endtable */ diff --git a/doc/reference/modules/nsis-module.qdoc b/doc/reference/modules/nsis-module.qdoc index f409d17bc..c66add6d4 100644 --- a/doc/reference/modules/nsis-module.qdoc +++ b/doc/reference/modules/nsis-module.qdoc @@ -181,5 +181,11 @@ \li 1.2 \li The rule that creates the NSIS setup executable attaches this tag to its output artifact. + \row + \li \c{"nsis.input"} + \li - + \li 1.10 + \li The rule that creates the NSIS setup executable will be dependent on artifacts + with this tag. \endtable */ diff --git a/doc/reference/modules/wix-module.qdoc b/doc/reference/modules/wix-module.qdoc index 1a7309654..84be797f2 100644 --- a/doc/reference/modules/wix-module.qdoc +++ b/doc/reference/modules/wix-module.qdoc @@ -269,5 +269,11 @@ \li 1.2 \li This tag is attached to WiX source files. Each source file will be compiled into one WiX object file. + \row + \li \c{"wix.input"} + \li - + \li 1.10 + \li The rule that creates the Microsoft Installer setup file or WiX setup executable + will be dependent on artifacts with this tag. \endtable */ |