summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2022-05-12 11:18:43 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-19 05:11:42 +0000
commit6ae87b13518887e6320cbe756333d9168b21bb84 (patch)
tree59702707dcaf4a0c1cbe3e5ae5ae2f6bfd5925a3
parent6b8f8710ce3f6e277c9b392aa448325907f827ee (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: Ie7e58666c750e398523ced01ebd6d64d9929561c Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 5f4e30299f6423c1d01d9eb0e696a9373762f71b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--conanfile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/conanfile.py b/conanfile.py
index d0c0c7303..9e2685877 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -71,8 +71,8 @@ class QtWebEngine(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 _qtwebengine_features}
+ return self._shared.convert_qt_features_to_conan_options(_qtwebengine_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 _qtwebengine_features}
+ return self._shared.convert_qt_features_to_default_conan_options(_qtwebengine_features)