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

1 files changed, 21 insertions, 27 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 492920efc..731171f61 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1426,34 +1426,28 @@ void PackageManagerCore::appendRootComponent(Component *component)
 }
 
 /*!
-    \class PackageManagerCore::ComponentType
-    \inmodule QtInstallerFramework
-    \brief The ComponentType class describes a component list.
-
-    This class is used with the components() function to describe what type of \c Component
-    list it should return.
-
-    \list
-        \li \c Root returns a list of root components.
-
-        \li \c Descendants returns a list of all descendant components.
-
-            \note In updater mode the list is empty, because component updates cannot have children.
-
-        \li \c Dependencies returns a list of all available dependencies when run as updater.
-
-            \note When running as installer, package manager, or uninstaller, this will always
-            result in an empty list.
-
-        \li \c Replacements returns a list of all available replacement components relevant to the
-            run mode.
-
-        \li \c AllNoReplacements returns a list of available components, including root, descendant,
+    \enum PackageManagerCore::ComponentType
+    \brief This enum holds the type of the component list to be returned:
+
+    \value  Root
+            Returns a list of root components.
+    \value  Descendants
+            Returns a list of all descendant components. In updater mode the
+            list is empty, because component updates cannot have children.
+    \value  Dependencies
+            Returns a list of all available dependencies when run as updater.
+            When running as installer, package manager, or uninstaller, this
+            will always result in an empty list.
+    \value  Replacements
+            Returns a list of all available replacement components relevant to
+            the run mode.
+    \value  AllNoReplacements
+            Returns a list of available components, including root, descendant,
             and dependency components relevant to the run mode.
-
-        \li \c All returns a list of all available components, including root, descendant,
-            dependency, and replacement components relevant to the run mode.
-    \endlist
+    \value  All
+            Returns a list of all available components, including root,
+            descendant, dependency, and replacement components relevant to the
+            run mode.
 */
 
 /*!