diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-06-25 12:02:02 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-07-03 13:06:06 +0300 |
| commit | 9cb818812e3354bca526fb6cbff51d865f7a0601 (patch) | |
| tree | 600cb90f485dbd8ae542ef72c5afd2519f2e0ef6 /doc | |
| parent | bc96616492ce642831590dad97acde9942fe7e23 (diff) | |
Documentation fixes
Added missing documentation and fixed warnings.
KDUpdate documentation not added in this commit.
Change-Id: Idc0b167bed95b7ae4a46a350290fdb241aa94448
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/scripting-api/gui.qdoc | 2 | ||||
| -rw-r--r-- | doc/scripting-api/packagemanagercore.qdoc | 31 |
2 files changed, 31 insertions, 2 deletions
diff --git a/doc/scripting-api/gui.qdoc b/doc/scripting-api/gui.qdoc index 35539c6be..53a8d20c2 100644 --- a/doc/scripting-api/gui.qdoc +++ b/doc/scripting-api/gui.qdoc @@ -177,7 +177,7 @@ */ /*! - \qmlmethod void gui::setTextItems(object control, string[] items) + \qmlmethod void gui::setTextItems(object control, stringlist items) Updates the model of \a control (which must be a QComboBox or QAbstractItemView) such that it contains the given \a items. diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc index 8a31f54ea..f0bf1a19a 100644 --- a/doc/scripting-api/packagemanagercore.qdoc +++ b/doc/scripting-api/packagemanagercore.qdoc @@ -346,7 +346,7 @@ */ /*! - \qmlmethod void installer::setFileDialogAutomaticAnswer(string identifier, string &value) + \qmlmethod void installer::setFileDialogAutomaticAnswer(string identifier, string value) Automatically sets the existing directory or filename \a value to QFileDialog with the ID \a identifier. @@ -363,6 +363,15 @@ */ /*! + \qmlmethod boolean installer::containsFileDialogAutomaticAnswer(string identifier) + + Returns \c true if QFileDialog with the ID \a identifier has an automatic answer set. + + \sa setFileDialogAutomaticAnswer + \sa removeFileDialogAutomaticAnswer +*/ + +/*! \qmlmethod float installer::requiredDiskSpace() Returns the additional estimated amount of disk space in bytes required after installation. @@ -553,6 +562,20 @@ */ /*! + \qmlmethod void installer::setAllowedRunningProcesses(stringlist processes) + + Sets additional \a processes that can run when + updating with the maintenance tool. +*/ + +/*! + \qmlmethod stringlist installer::allowedRunningProcesses() + + Returns processes that are allowed to run when updating with + the maintenance tool. +*/ + +/*! \qmlmethod void installer::setDependsOnLocalInstallerBinary() Makes sure the installer runs from a local drive. Otherwise the user will get an @@ -822,6 +845,12 @@ */ /*! + \qmlmethod boolean installer::isCommandLineInstance() + + Returns \c true if running as command line instance. +*/ + +/*! \qmlmethod boolean installer::runInstaller() Runs the installer. Returns \c true on success, \c false otherwise. |