Merge remote-tracking branch 'origin/2.0'

Conflicts:
	src/libs/installer/packagemanagercore.cpp

Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8

2 files changed, 8 insertions, 3 deletions

diff --git a/examples/doc/dynamicpage.qdoc b/examples/doc/dynamicpage.qdoc
index 1549b49f6..c066b36d2 100644
--- a/examples/doc/dynamicpage.qdoc
+++ b/examples/doc/dynamicpage.qdoc
@@ -91,6 +91,10 @@
     \printuntil }
     \dots
 
+    \l installer::addWizardPage() registers a new page to the installer. \l gui::pageWidgetByObjectName()
+    is then used to retrieve the root widget of the new page, with its name being \c "Dynamic" + the object
+    name of the root widget as set in the .ui file.
+
     \section1 Generating the Example Installer
 
     To create the example installer, switch to the example source directory on
diff --git a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js
index 66fc7de18..8b7da2dd0 100644
--- a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js
+++ b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js
@@ -162,9 +162,10 @@ Component.prototype.readyToInstallWidgetEntered = function () {
     var widget = gui.pageWidgetByObjectName("DynamicReadyToInstallWidget");
     if (widget != null) {
         var html = "<b>Components to install:</b><ul>";
-        for (i = 0; i < installer.components.length; ++i) {
-            if (installer.components[i].installationRequested())
-                html = html + "<li>" + installer.components[i].displayName + "</li>"
+        var components = installer.components();
+        for (i = 0; i < components.length; ++i) {
+            if (components[i].installationRequested())
+                html = html + "<li>" + components[i].displayName + "</li>"
         }
         html = html + "</ul>";
         widget.showDetailsBrowser.html = html;