diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2022-05-12 11:42:46 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-13 08:39:07 +0000 |
| commit | 1cb79dd8970c2efa265036bd816c250038bca171 (patch) | |
| tree | 91aac98837000fe0445e72f3d5e685ef795c445e | |
| parent | 3996e4d8befb761452088645ab2101763e7563fc (diff) | |
Conan: Enable recipe exclude options passed to qt-configure-module6.3
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: I91f1f793ac9d932b1aa20f475c335c2ddd504cef
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e2a3f4b128da0840c119d9fe5dd2cc6fa5879783)
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 891dbbfcb..0a27af85d 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. @@ -73,8 +73,8 @@ class Qt3D(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 _qt3d_features} + return self._shared.convert_qt_features_to_conan_options(_qt3d_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 _qt3d_features} + return self._shared.convert_qt_features_to_default_conan_options(_qt3d_features) |