diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-19 14:43:59 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-23 07:53:16 +0200 |
| commit | bc755ef2113caaf4ccbe85d4f891a26d29b8c698 (patch) | |
| tree | 962eb4354f2f4644ea2f6f0fa460a5bbf7c4aa59 | |
| parent | 39347606f6d2513a8da13a961aff9f62afd619bc (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: I7d712afad3767d9ce329b8757ff05695c79f76fb
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 8b41757..16d158c 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 af6736b..fe7fcd1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -5,6 +5,3 @@ dependencies: ../qtdeclarative: ref: d1ef40ff4d81b5d544c08495d3237e0ddff803e9 required: true - ../qttools: - ref: 5bf19028db18125933180822eeab6abd0c177b30 - required: false |