diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2022-05-12 11:33:47 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2022-05-13 09:49:06 +0300 |
| commit | 76003b185a85de15531db3e24ab11f1fb0b765ff (patch) | |
| tree | 68a4a081f41f58a75cfab28a235ff7f9c5495d35 /conanfile.py | |
| parent | 32c19fec3ace7cf738c32d6eb165f0a55bb213c6 (diff) | |
| download | qttools-76003b185a85de15531db3e24ab11f1fb0b765ff.tar.gz | |
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: I88ebb5ed3a90e23d4d81afe45d1b8d27cbc0cbb0
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conanfile.py b/conanfile.py index 26be27021..17af9e1c1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -75,8 +75,8 @@ class QtTools(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 _qttools_features} + return self._shared.convert_qt_features_to_conan_options(_qttools_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 _qttools_features} + return self._shared.convert_qt_features_to_default_conan_options(_qttools_features) |