From 2358a5fdad46d91914681521abecdd42622cd9f7 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 19 Mar 2021 14:39:36 +0200 Subject: [PATCH] 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: Idcb782ceffb757389255024ae5ef5a668d980ffa Reviewed-by: Toni Saario (cherry picked from commit 1d98b0c39a6d36a61d7b1794fe48f5ac3f03d326) Reviewed-by: Akseli Salovaara --- coin/module_config.yaml | 3 --- dependencies.yaml | 3 --- 2 files changed, 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 54ff5b1..c6fffe8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -5,6 +5,3 @@ dependencies: ../qtdeclarative: ref: 8eac25aeba4e27f6bcf16cec4bb91073b0ea3054 required: true - ../qttools: - ref: d12847bb3d7fd147a1c44396b5b4ca7cbd53d86b - required: true