summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-11-08 09:03:46 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2021-12-17 09:05:35 +0200
commitc3a9ee8ec4a8aefd0de3aa67eaa93531a539c95f (patch)
treecb8b1430fe3155dfc2c904530840f15499a9416d
parent133a214afdac137efb5661f9fccbb1a19553287f (diff)
downloadqtapplicationmanager-c3a9ee8ec4a8aefd0de3aa67eaa93531a539c95f.tar.gz
Enable documentation build
And update dependencies at the same time. Dev will get it's own change because of dependency update Change-Id: I0a7fee7dc7850af17360cbc829204ba45954a712 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e5dc3f6f4034aec21b64327050b7d489c1dd614d)
-rw-r--r--coin/module_config.yaml7
-rw-r--r--dependencies.yaml3
2 files changed, 9 insertions, 1 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 8470ed29..bb08ecb4 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -16,7 +16,12 @@ accept_configuration:
instructions:
Build:
- - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
+ - type: EnvironmentVariable
+ variableName: BUILD_DOCUMENTATION
+ variableValue: "1"
+ - type: Group
+ instructions:
+ - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test:
- type: Group
diff --git a/dependencies.yaml b/dependencies.yaml
index 2f9e2f17..a65d4f18 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -8,3 +8,6 @@ dependencies:
../qtwayland:
ref: 4fed5197b924d4d3db84e77b8a89ee7c3a8aa019
required: false
+ ../qttools:
+ ref: a84f62ee148c1336d15dbfa3cf11429b89f1d218
+ required: false