summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-01-27 14:55:36 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2021-02-23 10:20:55 +0200
commit4448aed009784236f66067cc9ceecf5e86a640b5 (patch)
treebb78a0c87b2c7bafb10dae0186ea8a0ccdbfa032
parent0df8ef4b5f568f52e65dbe3fba34905a96ad6d4d (diff)
downloadqtactiveqt-4448aed009784236f66067cc9ceecf5e86a640b5.tar.gz
Enable documentation build
And at same time update dependencies as well Task-number: QTBUG-90420 Change-Id: I328c43a6d32287d935bea035bfd4571a64d77581 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
-rw-r--r--coin/module_config.yaml3
-rw-r--r--dependencies.yaml3
2 files changed, 6 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index ffddb12..a647c3a 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -6,6 +6,9 @@ accept_configuration:
instructions:
Build:
+ - type: EnvironmentVariable
+ variableName: BUILD_DOCUMENTATION
+ variableValue: "1"
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test:
diff --git a/dependencies.yaml b/dependencies.yaml
index 5e88585..faa5b89 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -2,3 +2,6 @@ dependencies:
../qtbase:
ref: 9a5a2d61c077ddc8a0fb4e2cce7a36a5dbb081d5
required: true
+ ../qttools:
+ ref: a6a22831aca7d21fdf253bea6d1b0fe0c39e65ae
+ required: false