diff options
| author | Adrian Herrmann <adrian.herrmann@qt.io> | 2024-03-28 14:36:55 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-28 19:00:44 +0000 |
| commit | bd419a6e7f8694f1b807b911c7ce7257ffe7829c (patch) | |
| tree | 9da96dc8c0f9c9edd9b3886022a1d3393893c0b1 | |
| parent | a5a2e97aaaf7b5c2ea7d9547cc0fdfbc9b09c97a (diff) | |
build: Add multimedia dependencies to Qt artifacts
Add a number of DLL dependencies required by Qt Multimedia to the list
of Qt artifacts to be retrieved from the Qt binary directory.
Fixes: PYSIDE-2656
Change-Id: I0ead82ce09a7afb309ff674b4f5fe5afc32319da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 3f3856ba94a59de49bc6c636c77a6173fd91c333)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 5 | ||||
| -rw-r--r-- | build_scripts/wheel_files.py | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index a3be7f67a..9c29953be 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -288,6 +288,11 @@ def copy_qt_artifacts(pyside_build, destination_qt_dir, copy_pdbs, _vars): # <qt>/bin/*.dll and Qt *.exe -> <setup>/{st_package_name} qt_artifacts_permanent = [ + "avcodec-60.dll", + "avformat-60.dll", + "avutil-58.dll", + "swresample-4.dll", + "swscale-7.dll", "opengl*.dll", "designer.exe", "linguist.exe", diff --git a/build_scripts/wheel_files.py b/build_scripts/wheel_files.py index 9103a5ca2..0d3072773 100644 --- a/build_scripts/wheel_files.py +++ b/build_scripts/wheel_files.py @@ -848,6 +848,10 @@ def module_QtMultimedia() -> ModuleData: data.translations.append("qtmultimedia_*") data.plugins = get_module_plugins(json_data) + if sys.platform == "win32": + data.extra_files.extend(["avcodec-60.dll", "avformat-60.dll", "avutil-58.dll", + "swresample-4.dll", "swscale-7.dll"]) + return data |