summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-11-08 08:56:32 +0200
committerDominik Holland <dominik.holland@qt.io>2021-11-09 15:07:08 +0100
commit6c5fc5c69056e9b7d1965edc33c53b2b86cd8907 (patch)
tree455efa562a9c86a6fc3a5cf4488fb946fb7a9435
parentc89f5e7d9355215492a568e1f0064292439f42d7 (diff)
Enable documentation build
And update dependencies at the same time. Dev will get it's own change because of dependency update Change-Id: Ie4a588c1d725a6632873440a1f81d8083ea1616d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dominik Holland <dominik.holland@qt.io>
-rw-r--r--coin/module_config.yaml3
-rw-r--r--dependencies.yaml9
2 files changed, 9 insertions, 3 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 556a0663..94b41e2b 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -11,6 +11,9 @@ accept_configuration:
instructions:
Build:
+ - type: EnvironmentVariable
+ variableName: BUILD_DOCUMENTATION
+ variableValue: "1"
- type: AppendToEnvironmentVariable
variableName: NON_QTBASE_CONFIGURE_ARGS
variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}}"
diff --git a/dependencies.yaml b/dependencies.yaml
index fabac311..284c245e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,13 @@
dependencies:
../qtdeclarative:
- ref: 5e7c341a8deacaca3e76de5c62d288e860c0385c
+ ref: a4c8136b3d951938ad44e9736d8b4f4438d5bdf0
required: true
../qtmultimedia:
- ref: 47b6a81a318f7f9deec98724968684023a23d213
+ ref: 066c1491336441a42c1ee383fb778fff6639d404
required: true
../qtremoteobjects:
- ref: 131e1127a5640de7a4486bc91b078377f0b2c3a0
+ ref: fb7f19ce2f9253a526f2e55e0ef818f248762744
required: true
+ ../qttools:
+ ref: ea8de3fc94179a3362ead3a4e8b660ba3ff4038d
+ required: false