diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-19 14:37:14 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-30 11:57:05 +0300 |
| commit | 3ba6970a500523df2546c408b8310d48f6a45fac (patch) | |
| tree | aa4f17a7860091baf45beb75a7e9ce19f02c3ff3 | |
| parent | 86ff21be229b3245af5105a711308315250bed68 (diff) | |
| download | qtimageformats-3ba6970a500523df2546c408b8310d48f6a45fac.tar.gz | |
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
Change-Id: I600738630642d1ca369f871a7aa8792b6af9ba58
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e6b9dc3c68d9a2310efef88c4d4bc13a07d57e1d)
Reviewed-by: Akseli Salovaara <akseli.salovaara@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 2f11b69..aa0fd43 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -2,6 +2,3 @@ dependencies: ../qtbase: ref: 101581484bd278ce4a5f329ffb13c9e0b0e4c131 required: true - ../qttools: - ref: d12847bb3d7fd147a1c44396b5b4ca7cbd53d86b - required: true |