summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-05-12 12:12:36 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-05-15 10:29:44 +0000
commit4811c094a0f15fffbf3016f69bbba57a0ffe0cbe (patch)
tree5a0c12cb480389c6ba2b8493e25e96fd60f36d92
parent6016f9aa4678a3779df5618f3719b298ab606329 (diff)
Doc: Add scripting api documentation for setAutoAcceptLicenses()
Change-Id: I5478b6bf6d62f6d6db78e3d3ae3dfaeee573c220 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
-rw-r--r--doc/scripting-api/packagemanagercore.qdoc8
-rw-r--r--src/libs/installer/packagemanagercore.cpp4
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc
index ac6cad2ce..1cff11c84 100644
--- a/doc/scripting-api/packagemanagercore.qdoc
+++ b/doc/scripting-api/packagemanagercore.qdoc
@@ -324,6 +324,14 @@
*/
/*!
+ \qmlmethod void installer::setAutoAcceptLicenses()
+
+ Automatically accepts all license agreements required to install the selected components. This
+ can be used to skip the command line license acceptance query. The names of the accepted
+ individual licenses are still printed to a console.
+*/
+
+/*!
\qmlmethod float installer::requiredDiskSpace()
Returns the additional estimated amount of disk space in bytes required after installation.
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 6dbfd811b..d1a9c6351 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -614,7 +614,9 @@ void PackageManagerCore::acceptMessageBoxDefaultButton()
}
/*!
- Automatically accept all licenses required by components to install.
+ Automatically accepts all license agreements required to install the selected components.
+
+ \sa {installer::setAutoAcceptLicenses}{installer.setAutoAcceptLicenses}
*/
void PackageManagerCore::setAutoAcceptLicenses()
{