summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/installerfw-using.qdoc6
-rw-r--r--doc/installerfw.qdoc15
-rw-r--r--doc/scripting-api/packagemanagercore.qdoc8
3 files changed, 25 insertions, 4 deletions
diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc
index f0205755f..5c5bbbbc4 100644
--- a/doc/installerfw-using.qdoc
+++ b/doc/installerfw-using.qdoc
@@ -448,10 +448,12 @@
The \c search command can be used to search components from available repositories, or
from integrated binary content in case of an offline installer. It can be used with
no arguments to list all available components or with a regular expression to get a list
- of only components matching the pattern:
+ of only components matching the pattern. The \c --filter-packages option can be
+ used to specify additional filters for the search operation. For a list of usable
+ information elements with the option, refer to \l{Summary of Package Information File Elements}.
\code
- installer.exe search "expression"
+ installer.exe --filter-packages "DisplayName=MyComponent, Version=1.0" search "expression"
\endcode
\section1 Performing Full Uninstallation
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index c76576f27..0d60a3fca 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
@@ -247,6 +247,11 @@
\li Create a local repository inside the installation directory. This option has no
effect on online installers.
\row
+ \li --fp, --filter-packages <element=regex,...>
+ \li [CLI] Comma separated list of additional key-value pair filters used to query packages with the
+ search command. The keys can be any of the possible package information elements, like
+ \c DisplayName and \c Description.
+ \row
\li --am, --accept-messages
\li [CLI] Accepts all message queries without user input.
\row
@@ -316,6 +321,9 @@
\row
\li se, search <regexp>
\li Search available packages. If no search pattern is given, show all available packages.
+
+ \note The \c --filter-packages option can be used to specify additional filters for
+ the search operation. See \l{Summary of Options}.
\row
\li co, create-offline <pkg ...>
\li Create offline installer from selected packages.
@@ -1235,6 +1243,11 @@
\row
\li -v or --verbose
\li Display debug output.
+ \row
+ \li -s or --sha-update p1,...,pn
+ \li Comma-separated list of packages to be updated based on the component sha
+ checksum instead of the version number. This parameter adds a new \c <ContentSha1>
+ node to the \c Updates.xml.
\endtable
\note We recommend that you use the \c {--update-new-packages} parameter
to update an existing repository, especially if you have a content delivery
diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc
index 39387b3ae..918aed78d 100644
--- a/doc/scripting-api/packagemanagercore.qdoc
+++ b/doc/scripting-api/packagemanagercore.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
@@ -862,6 +862,12 @@
*/
/*!
+ \qmlmethod boolean installer::isPackageViewer()
+
+ Returns \c true if the current installer is executed as package viewer.
+*/
+
+/*!
\qmlmethod boolean installer::isUserSetBinaryMarker()
Returns \c true if the magic binary marker has been set by user.