Better rid of 'forbidden modules' and related folders.

part of CURA-11622
Ultimaker · Dec 10, 2024 · 55f59b7 · 55f59b7
1 parent 5e59458
commit 55f59b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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