From 5928a0529c3b25dd30ac5df16cb28bc33f1563c0 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 19 Mar 2021 14:32:32 +0200 Subject: Drop documentation build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: I3842618c8ee8e546557fa88b784f714c43fd0f09 Reviewed-by: Tomi Korpipää --- 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 c27a12ac..7004c27d 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 14050bbd..908994b4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -5,6 +5,3 @@ dependencies: ../qtdeclarative: ref: d1ef40ff4d81b5d544c08495d3237e0ddff803e9 required: false - ../qttools: - ref: 5bf19028db18125933180822eeab6abd0c177b30 - required: false -- cgit v1.2.3