Merge remote-tracking branch 'origin/3.2' into master

Change-Id: Ie42b694119ecaa59c9df4aa0253663107ef0c68c

4 files changed, 30 insertions, 6 deletions

diff --git a/doc/config/ifw.qdocconf b/doc/config/ifw.qdocconf
index 884539f27..d58de3ab4 100644
--- a/doc/config/ifw.qdocconf
+++ b/doc/config/ifw.qdocconf
@@ -140,4 +140,6 @@ defines                 += ABSTRACTTASK_H \
                            UI_PROXYCREDENTIALSDIALOG_H \
                            UI_SERVERAUTHENTICATIONDIALOG_H \
                            UNINSTALLERCALCULATOR_H \
-                           UNZIPTASK_H
+                           UNZIPTASK_H \
+                           REPOSITORYCATEGORY_H \
+                           COMPONENTSELECTIONPAGE_P_H
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index 7d3300138..b087a2b61 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -45,9 +45,9 @@
     The installers have been tested on the following platforms:
 
     \list
-        \li Microsoft Windows XP, and later
-        \li Ubuntu Linux 11.10, and later
-        \li OS X 10.7, and later
+        \li Microsoft Windows 7, and later
+        \li Ubuntu Linux 16.04, and later
+        \li macOS 10.12, and later
     \endlist
 
     \section1 Building from Sources
@@ -59,7 +59,8 @@
     \section2 Supported Compilers
 
     The Qt Installer Framework can be compiled with Microsoft Visual Studio
-    2013 and newer, GCC 4.7 and newer, and Clang 3.1 and newer.
+    2013 and newer, GCC 4.7 and newer, and Clang 3.1 and newer. Currently, the
+    tested combination for Windows is Qt 5.12.4 with MSVC 2015.
 
     \section2 Configuring Qt
 
@@ -69,7 +70,7 @@
     from http://doc.qt.io/qt-5/ssl.html if you are statically linking against
     OpenSSL libraries.
 
-    The required Qt version is 5.9.x.
+    Qt versions between 5.9.0 and 5.12.x are supported.
 
     \section3 Configuring Qt for Windows
 
diff --git a/doc/scripting-api/component.qdoc b/doc/scripting-api/component.qdoc
index 6e55615b7..930d214f2 100644
--- a/doc/scripting-api/component.qdoc
+++ b/doc/scripting-api/component.qdoc
@@ -359,6 +359,14 @@
 */
 
 /*!
+    \qmlmethod void component::addAutoDependOn(string newDependOn)
+
+     Adds the component specified by \a newDependOn to the automatic depend-on list.
+
+    \sa autoDependencies
+*/
+
+/*!
     \qmlmethod void component::setInstalled()
 
     Set's the components state to installed.
diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc
index b4fe4c0fb..18b29b9f9 100644
--- a/doc/scripting-api/packagemanagercore.qdoc
+++ b/doc/scripting-api/packagemanagercore.qdoc
@@ -124,6 +124,13 @@
 */
 
 /*!
+    \qmlsignal installer::metaJobTotalProgress(int progress)
+
+    Triggered when total progress value of the communication with a
+    remote repository changes.
+*/
+
+/*!
     \qmlsignal installer::metaJobInfoMessage(string message)
 
     Triggered with informative updates of the communication with a remote repository.
@@ -285,6 +292,12 @@
 */
 
 /*!
+    \qmlmethod void installer::clearComponentsToInstallCalculated()
+
+    Forces a recalculation of components to install.
+*/
+
+/*!
    \qmlmethod void installer::autoAcceptMessageBoxes()
 
    Automatically accept all user message boxes.