diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-03-16 10:21:26 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-03-16 10:35:50 +0200 |
| commit | cf47ae2dcceeacb63d37dcffffa3ff37b1c50342 (patch) | |
| tree | be7382f930eff628261a70ee3774a5245ea5ea5b /doc | |
| parent | 02a7a7b8c4e4cc8d5cb2ec64074d32a7598c373a (diff) | |
| parent | c0732c406741bbd3d8d16f32f599e7ce83155c85 (diff) | |
Merge remote-tracking branch 'origin/3.2' to master
Change-Id: Ia4cf718409ce431cce8d766865ecec506426afb9
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/installerfw.qdoc | 8 | ||||
| -rw-r--r-- | doc/operations.qdoc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index d8fc44266..2edc2977b 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -1034,15 +1034,15 @@ \li --verbose \li Display additional information. \row - \li --update <file> + \li update <binary> <installerbase> \li Update an existing installer or maintenance tool with a new installer base. \row - \li --dump <folder> + \li dump <binary> <folder> \li Dump the binary content that belongs to an installer or maintenance tool into the target. \row - \li --operation <mode,name,args,...> + \li operation <mode,name,args,...> \li Execute an operation with a list of arguments. \c mode can be \c DO or \c UNDO, depending on whether the step diff --git a/doc/operations.qdoc b/doc/operations.qdoc index 91a3cf04a..bdc4caa2c 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -260,7 +260,7 @@ For example, to test copying a file: \code - devtool --operation DO,Copy,<source>,<target> + devtool operation <binary> DO,Copy,<source>,<target> \endcode */ |