diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-19 14:20:22 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-19 12:46:18 +0000 |
| commit | 681cd61eb9910e8bdb229a2170599838c4d1e563 (patch) | |
| tree | e86da90ec2f4cdd88890f8fbfd65fdb2f12bd410 | |
| parent | 9261e16d22f2b951e2a5ce12357cc70cb857ac20 (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: I260d20caf2367f97ab3fca00266dd9d5bc4cf447
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 8b41757ad..16d158c6b 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 d0211dc46..0f260444b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -8,6 +8,3 @@ dependencies: ../qtshadertools: ref: cbbd55ce6befca28553677a691cc18229d20c7f7 required: true - ../qttools: - ref: 5bf19028db18125933180822eeab6abd0c177b30 - required: false |