diff options
| -rw-r--r-- | doc/installerfw.qdoc | 2 | ||||
| -rw-r--r-- | src/libs/installer/component.cpp | 10 | ||||
| -rw-r--r-- | src/libs/kdtools/localpackagehub.cpp | 1 | ||||
| -rw-r--r-- | src/libs/kdtools/updateoperation.cpp | 12 |
4 files changed, 24 insertions, 1 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 0543a800c..82cc57d8e 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -104,7 +104,7 @@ \l{Configuration File}. \li Create a package information file called \c package.xml in the - \c {config\meta} directory. It contains settings for deployment and + \c {packages\{component}\meta} directory. It contains settings for deployment and the installation process. For more information, see \l{Meta Directory}. diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index ff01e4251..66f333377 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -212,6 +212,16 @@ static const QLatin1String scUnstable("Unstable"); */ /*! + \property QInstaller::Component::treeName + + \brief The tree name of the component. Specifies the location of the component in the install tree view. + + \note If the tree name is not set, the tree view is organized based on the component name. + + \note Must be unique, the tree name must not conflict with other component's names or tree names. +*/ + +/*! \fn QInstaller::Component::loaded() \sa {component::loaded}{component.loaded} diff --git a/src/libs/kdtools/localpackagehub.cpp b/src/libs/kdtools/localpackagehub.cpp index 9d35a9d1d..1a754d7d5 100644 --- a/src/libs/kdtools/localpackagehub.cpp +++ b/src/libs/kdtools/localpackagehub.cpp @@ -304,6 +304,7 @@ void LocalPackageHub::refresh() Marks the package specified by \a name as installed. Sets the values of \a version, \a title, + \a treeName, \a description, \a dependencies, \a autoDependencies, diff --git a/src/libs/kdtools/updateoperation.cpp b/src/libs/kdtools/updateoperation.cpp index 35c9dce2e..00b059af1 100644 --- a/src/libs/kdtools/updateoperation.cpp +++ b/src/libs/kdtools/updateoperation.cpp @@ -68,6 +68,18 @@ using namespace KDUpdater; to get the human-readable description of the error that occurred. */ +/*! + \enum UpdateOperation::OperationType + This enum code specifies the operation type. + + \value Backup + Backup operation. + \value Perform + Perform operation. + \value Undo + Undo operation. +*/ + /* \internal Returns a filename for a temporary file based on \a templateName. |