diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-19 14:39:36 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-22 15:22:05 +0200 |
| commit | 1d98b0c39a6d36a61d7b1794fe48f5ac3f03d326 (patch) | |
| tree | f167416c55aac68e24eebb3e7741cb7ba92da4dc | |
| parent | bc4dc1d5b12ff924f6455c14473c3ce197e6cd2b (diff) | |
Drop documentation build
We will add additional libraries back to the qt5.git. Having
documentation build enabled in additional library will cause problems
in qt5.git integrations so we need to drop it from module builds.
At same time drop the qttools dependency which were added for
documentation build
Task-number: QTBUG-91796
Pick-to: dev
Change-Id: Idcb782ceffb757389255024ae5ef5a668d980ffa
Reviewed-by: Toni Saario <toni.saario@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 3 | ||||
| -rw-r--r-- | dependencies.yaml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index fd32d84..7f31a55 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -6,9 +6,6 @@ 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 bb34469..908994b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -5,6 +5,3 @@ dependencies: ../qtdeclarative: ref: d1ef40ff4d81b5d544c08495d3237e0ddff803e9 required: false - ../qttools: - ref: 5bf19028db18125933180822eeab6abd0c177b30 - required: true |