From 1cb79dd8970c2efa265036bd816c250038bca171 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Thu, 12 May 2022 11:42:46 +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 Change-Id: I91f1f793ac9d932b1aa20f475c335c2ddd504cef Reviewed-by: Toni Saario (cherry picked from commit e2a3f4b128da0840c119d9fe5dd2cc6fa5879783) Reviewed-by: Qt Cherry-pick Bot --- conanfile.py | 6 +++--- 1 file 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) -- cgit v1.2.3