From 99aa1ba77c8954a7d3e2c0ab1f2e41ad5cd22e1f Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Thu, 12 May 2022 11:59:04 +0300 Subject: Conan: Enable recipe exclude options passed to qt-configure-module Current implementation allows only to enable a leaf module feature and when setting the option/feature to 'no' it gets translated to not being passed at all to qt-configure-module. This change calls 'convert_qt_features_to_conan_options()' from qt-conan-common module which can correctly translate the given recipe options so that: -o option1=True -> qt-configure-module -feature-option1 -o option1=False -> qt-configure-module -no-feature-option1 Task-number: QTBUG-100073 Pick-to: 6.3 Change-Id: Ica134403191c388680e2c776a81c90abf82c1237 Reviewed-by: Toni Saario --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index aec6f724..7e2dab78 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the release tools of the Qt Toolkit. @@ -75,8 +75,8 @@ class QtCharts(ConanFile): def get_qt_leaf_module_options(self) -> Dict[str, Any]: """Implements abstractmethod from qt-conan-common.QtLeafModule""" - return {item.replace("-", "_"): ["yes", "no", None] for item in _qtcharts_features} + return self._shared.convert_qt_features_to_conan_options(_qtcharts_features) def get_qt_leaf_module_default_options(self) -> Dict[str, Any]: """Implements abstractmethod from qt-conan-common.QtLeafModule""" - return {item.replace("-", "_"): None for item in _qtcharts_features} + return self._shared.convert_qt_features_to_default_conan_options(_qtcharts_features) -- cgit v1.2.3