From 41d8b09239ce0ace2fd8674aaecae1528b1985e4 Mon Sep 17 00:00:00 2001 From: Richard Weickelt Date: Fri, 30 Aug 2019 22:56:11 +0200 Subject: Allow build of at least the html docs when cross-compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qch requires qhelpgenerator which is not bootstrapped, but qdoc works to some extent. Change-Id: I08ce043281c45a29829a2ec25d8ad3e38e90d4e2 Reviewed-by: Jörg Bornemann --- doc/doc.qbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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" } -- cgit v1.2.3