diff options
| author | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-06-21 11:51:10 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-06-21 12:32:42 +0300 |
| commit | e87c58548ae1e412491210e1951a2527ac0ff381 (patch) | |
| tree | ca5efe41f021f431873318b66daa859d1021b7aa /doc/scripting-api | |
| parent | 76fd6e8f2953347ea0bf7a57b643968784bc9acc (diff) | |
| parent | 6a06b8adc5d6fabac4401219044b928043e7e8a9 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
Changelog
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
src/libs/7zip/7zip.pro
src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
src/libs/installer/component.cpp
src/libs/installer/lib7z_facade.cpp
src/libs/installer/packagemanagercore.cpp
src/libs/installer/proxycredentialsdialog.h
src/sdk/translations/ja.ts
tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
tests/auto/installer/scriptengine/tst_scriptengine.cpp
tests/auto/installer/settings/tst_settings.cpp
Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2
Diffstat (limited to 'doc/scripting-api')
| -rw-r--r-- | doc/scripting-api/component.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/scripting-api/component.qdoc b/doc/scripting-api/component.qdoc index 0dcd28681..1765a1217 100644 --- a/doc/scripting-api/component.qdoc +++ b/doc/scripting-api/component.qdoc @@ -325,6 +325,18 @@ */ /*! + \qmlmethod boolean component::addOperation(string operation, string parameter1 = "", string parameter2 = "", ..., string parameter10 = "") + + Convenience method for calling addOperation(string, stringlist) with up to 10 arguments. +*/ + +/*! + \qmlmethod boolean component::addElevatedOperation(string operation, string parameter1 = "", string parameter2 = "", ..., string parameter10 = "") + + Convenience method for calling addElevatedOperation(string, stringlist) with up to 10 arguments. +*/ + +/*! \qmlmethod boolean component::addElevatedOperation(string operation, stringlist parameters) Creates and adds an installation operation for \a operation. Add any number of parameters. |