diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2022-05-12 11:59:04 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-13 10:14:38 +0000 |
| commit | 1f70cab21fc4f56f8152299844228a2402d23721 (patch) | |
| tree | 3c0fc94c37e29f90f7090f0d835ba8dff01fa453 | |
| parent | 7bf7a15163a17e63c2a8851d4dd09131947cc6c5 (diff) | |
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
Change-Id: Ica134403191c388680e2c776a81c90abf82c1237
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 99aa1ba77c8954a7d3e2c0ab1f2e41ad5cd22e1f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | conanfile.py | 6 |
1 files 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) |