From 55f59b79712d4897bf1d459d68ac4313efc736b1 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 17:30:27 +0100 Subject: [PATCH] Better rid of 'forbidden modules' and related folders. part of CURA-11622 --- conandata.yml | 2 +- conanfile.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4426ffa3bc3..13bd7a74925 100644 --- a/conandata.yml +++ b/conandata.yml @@ -163,7 +163,7 @@ pyinstaller: - [ "qt", "lab", "animat" ] - [ "qt", "mqtt" ] - [ "qt", "net", "auth" ] - - [ "qt", "quick3d" ] + - [ "quick3d" ] - [ "qt", "timeline" ] - [ "qt", "virt", "key" ] - [ "qt", "wayland", "compos" ] diff --git a/conanfile.py b/conanfile.py index 5501b189a16..fa155771266 100644 --- a/conanfile.py +++ b/conanfile.py @@ -179,6 +179,7 @@ def _delete_unwanted_binaries(self, root): "qtmqtt", "qtnetworkauth", "qtquick3d", + "quick3d", "qtquick3dphysics", "qtquicktimeline", "qtvirtualkeyboard", @@ -207,7 +208,7 @@ def _delete_unwanted_binaries(self, root): to_remove_files.append(pathname) for dirname in dir_: for forbidden in prohibited: - if forbidden.lower() == str(dirname).lower(): + if forbidden.lower() in str(dirname).lower(): pathname = os.path.join(root, dirname) to_remove_dirs.append(pathname) break