From c595576cabdc33d45061cb92cf65c8c342559ef2 Mon Sep 17 00:00:00 2001 From: Antoine Martin <antoine@xpra.org> Date: Tue, 10 Sep 2024 13:28:23 +0700 Subject: [PATCH] don't bundle any Qt components in this branch --- packaging/MSWindows/MINGW_BUILD.sh | 3 +++ setup.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/packaging/MSWindows/MINGW_BUILD.sh b/packaging/MSWindows/MINGW_BUILD.sh index 403d54e817..7de9835df0 100644 --- a/packaging/MSWindows/MINGW_BUILD.sh +++ b/packaging/MSWindows/MINGW_BUILD.sh @@ -528,6 +528,9 @@ for i in `seq 4`; do find share/icons -type d -exec rmdir {} \; 2> /dev/null done +#no qt in this branch +rm qt.conf + #leave ./dist popd > /dev/null diff --git a/setup.py b/setup.py index bbec95c871..93fe88328d 100755 --- a/setup.py +++ b/setup.py @@ -1713,6 +1713,8 @@ def add_service_exe(script, icon, base_name): #this is a mac osx thing: "ctypes.macholib") + remove_packages("PyQt6") + if webcam_ENABLED: external_includes.append("cv2") else: