aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2019-08-30 22:56:11 +0200
committerRichard Weickelt <richard@weickelt.de>2019-09-02 07:50:56 +0000
commit41d8b09239ce0ace2fd8674aaecae1528b1985e4 (patch)
tree369dab83ff3729a9bfb3f40a88f6594eb4da8033
parentba5fee416d945f0bd241c113d0270eee07b58106 (diff)
Allow build of at least the html docs when cross-compiling
Qch requires qhelpgenerator which is not bootstrapped, but qdoc works to some extent. Change-Id: I08ce043281c45a29829a2ec25d8ad3e38e90d4e2 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--doc/doc.qbs4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/doc.qbs b/doc/doc.qbs
index 29ccd9938..194d8e157 100644
--- a/doc/doc.qbs
+++ b/doc/doc.qbs
@@ -8,7 +8,9 @@ Project {
Product {
name: "qbs documentation"
builtByDefault: false
- type: ["qch", "qbsdoc.qdoc-html-fixed"]
+ type: Qt.core.config.contains("cross_compile") ?
+ ["qbsdoc.qdoc-html-fixed"] : [ "qbsdoc.qdoc-html-fixed", "qch"]
+
property string fixedHtmlDir: FileInfo.joinPaths(buildDirectory, "qdoc-html-fixed")
Depends { name: "Qt.core" }
Depends { name: "qbsbuildconfig" }