Account for the Qbs docs build now requiring additional dependencies

Document it, and install the dependencies in the Docker images.

For the man page build, the installed version of the qbs app is now used
to get the help text rather than the non-installed version, since the
non-installed version may not be able to find all library dependencies
(like Qt) on some platforms by default. The build also now depends on
the other executables as well since their presence affects the output of
qbs --help.

Change-Id: Ic9896231aa76a346180bf30f7b2483391f5e4ea0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 9 insertions, 2 deletions

diff --git a/doc/man/man.qbs b/doc/man/man.qbs
index 99db2b3f8..44e2f0e12 100644
--- a/doc/man/man.qbs
+++ b/doc/man/man.qbs
@@ -1,6 +1,7 @@
 import qbs
 import qbs.File
 import qbs.FileInfo
+import qbs.ModUtils
 import qbs.Probes
 import qbs.Utilities
 
@@ -8,7 +9,7 @@ Product {
     name: "qbs man page"
     type: ["manpage"]
 
-    Depends { name: "qbs_app"; condition: updateManPage }
+    Depends { productTypes: ["qbsapplication"]; condition: updateManPage }
     Depends { name: "qbsbuildconfig" }
 
     property bool updateManPage: false
@@ -42,7 +43,13 @@ Product {
                 throw "Cannot update man page: help2man not available";
             if (Utilities.versionCompare(product.qbs.version, "1.9") < 0)
                 throw "Cannot update man page: qbs >= 1.9 required";
-            var args = [explicitlyDependsOn.application[0].filePath, "-o", output.filePath,
+            var qbsApp;
+            for (var i = 0; i < explicitlyDependsOn.application.length; ++i) {
+                var artifact = explicitlyDependsOn.application[i];
+                if (artifact.product.name === "qbs_app")
+                    qbsApp = ModUtils.artifactInstalledFilePath(artifact);
+            }
+            var args = [qbsApp, "-o", output.filePath,
                         "--no-info", "--name=the Qbs build tool"];
             var sections = inputs ? inputs["man.section"] : [];
             for (var i = 0; i < sections.length; ++i)