From 9a9c0137a50ea29807497b9f58bb67249507f25d Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Tue, 7 May 2024 17:40:00 +0100 Subject: [PATCH 1/3] Qt: default options should not be dependent on CI environment --- recipes/qt/5.x.x/conanfile.py | 2 +- recipes/qt/6.x.x/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index f45348ca816a3..29c06eefacfc0 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -122,7 +122,7 @@ class QtConan(ConanFile): "sysroot": None, "config": None, "multiconfiguration": False, - "essential_modules": not os.getenv('CONAN_CENTER_BUILD_SERVICE') + "essential_modules": True } default_options.update({f"{status}_modules": False for status in _module_statuses if status != "essential"}) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 4a2fb7512fa85..49959e956eb0b 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -121,7 +121,7 @@ class QtConan(ConanFile): "sysroot": None, "multiconfiguration": False, "disabled_features": "", - "essential_modules": not os.getenv('CONAN_CENTER_BUILD_SERVICE') + "essential_modules": True } default_options.update({f"{status}_modules": False for status in _module_statuses if status != "essential"}) From 3b5aef44ea307d0d197306d6eb7c7e78f06f81a3 Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Tue, 21 May 2024 11:44:14 +0100 Subject: [PATCH 2/3] Update recipes/qt/5.x.x/conanfile.py --- recipes/qt/5.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 29c06eefacfc0..4f149e048b319 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -122,7 +122,7 @@ class QtConan(ConanFile): "sysroot": None, "config": None, "multiconfiguration": False, - "essential_modules": True + "essential_modules": False } default_options.update({f"{status}_modules": False for status in _module_statuses if status != "essential"}) From d9704abc4ec57173c6e48ce17cd5ab1c72956b74 Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Tue, 21 May 2024 11:44:29 +0100 Subject: [PATCH 3/3] Update recipes/qt/6.x.x/conanfile.py --- recipes/qt/6.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 49959e956eb0b..a26f83ecf6e12 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -121,7 +121,7 @@ class QtConan(ConanFile): "sysroot": None, "multiconfiguration": False, "disabled_features": "", - "essential_modules": True + "essential_modules": False } default_options.update({f"{status}_modules": False for status in _module_statuses if status != "essential"})