summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2023-01-27 09:59:10 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2023-01-27 10:38:55 +0000
commitf5c48c86d3670240fc5c36c2f406196fc23527d5 (patch)
tree1823d302c330bf513908fdf68005d03ce5848f82 /doc
parent476b6d6fffaf6841adaf68889e8b8ddae17dd382 (diff)
parent50575212455fbd3109adbe92d8509fca3c51850a (diff)
Merge remote-tracking branch 'origin/4.5'
Diffstat (limited to 'doc')
-rw-r--r--doc/installerfw.qdoc8
-rw-r--r--doc/scripting-api/packagemanagercore.qdoc14
2 files changed, 18 insertions, 4 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 476234f80..a0fb9d848 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -907,8 +907,12 @@
The component is installed if and only if
all of the specified dependencies are fulfilled.
If a component has an automatic dependency on other components,
- the check box will not be visible next to the component in the component tree.
- The selection will be performed automatically.
+ the check box will not be visible next to the component in the component tree,
+ but this does not change the visibility of the check box in the updater view
+ where the end user may still manually select the component for update.
+
+ When running an installer or a maintenance tool in package manager
+ mode, the selection will be performed automatically.
If the component was not installed before, it will
be selected for installation only when all components
from this list are also selected for installation.
diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc
index b14fd957f..ac6830d33 100644
--- a/doc/scripting-api/packagemanagercore.qdoc
+++ b/doc/scripting-api/packagemanagercore.qdoc
@@ -325,15 +325,25 @@
*/
/*!
+ \qmlmethod boolean installer::recalculateAllComponents()
+
+ Recalculates all components to install and uninstall. Returns \c true
+ on success, \c false otherwise.
+*/
+
+/*!
\qmlmethod void installer::componentsToInstallNeedsRecalculation()
+ \deprecated [4.5] Use recalculateAllComponents() instead.
Ensures that component dependencies are re-calculated.
*/
/*!
\qmlmethod void installer::clearComponentsToInstallCalculated()
-
- Forces a recalculation of components to install.
+ \deprecated [4.5] Installer framework recalculates components each time the calculation
+ of components to install is requested, so there is no need to call this anymore, and the
+ method does nothing. On previous versions calling this forced a recalculation of
+ components to install.
*/
/*!