diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-14 11:07:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-14 17:37:57 +0200 |
| commit | 812fa2f59853fa693b77c04d4afaaee722931029 (patch) | |
| tree | 49d5186d0c7eaa9c6c24acb8f3b254e76cfe5152 /sources/pyside6/PySide6/QtMultimediaWidgets | |
| parent | 4bc6eb21e032b9523424ea1316440b9d6ad7c8d7 (diff) | |
Re-add QtMultimedia/Widgets
Fix it to build with
qtmultimedia/9a4822037def3b9d48abea8bbfd7ea20fd19849b (wip/qt6).
Remove typesystem_multimedia_forward_declarations.xml as the forward
declarations of QVideoWidget and QGraphicsVideoItem no longer exist.
Fix the tests.
Fix the player example to run/crash.
Pick-to: 6.1
Task-number: PYSIDE-1482
Change-Id: I340693e3510347f95b55395985bd2b0f294769a1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtMultimediaWidgets')
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimediaWidgets/typesystem_multimediawidgets.xml | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt index efdab2d1c..94443b496 100644 --- a/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt @@ -1,10 +1,8 @@ project(QtMultimediaWidgets) set(QtMultimediaWidgets_SRC -${QtMultimediaWidgets_GEN_DIR}/qcameraviewfinder_wrapper.cpp ${QtMultimediaWidgets_GEN_DIR}/qgraphicsvideoitem_wrapper.cpp ${QtMultimediaWidgets_GEN_DIR}/qvideowidget_wrapper.cpp -${QtMultimediaWidgets_GEN_DIR}/qvideowidgetcontrol_wrapper.cpp # module is always needed ${QtMultimediaWidgets_GEN_DIR}/qtmultimediawidgets_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtMultimediaWidgets/typesystem_multimediawidgets.xml b/sources/pyside6/PySide6/QtMultimediaWidgets/typesystem_multimediawidgets.xml index 7d3337031..e8d20494e 100644 --- a/sources/pyside6/PySide6/QtMultimediaWidgets/typesystem_multimediawidgets.xml +++ b/sources/pyside6/PySide6/QtMultimediaWidgets/typesystem_multimediawidgets.xml @@ -2,7 +2,7 @@ <!-- /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Python. @@ -42,11 +42,9 @@ <typesystem package="PySide6.QtMultimediaWidgets"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtMultimedia/typesystem_multimedia_common.xml" generate="no"/> + <load-typesystem name="QtMultimedia/typesystem_multimedia.xml" generate="no"/> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - <object-type name="QCameraViewfinder"/> <object-type name="QGraphicsVideoItem"/> <object-type name="QVideoWidget"/> - <object-type name="QVideoWidgetControl"/> </typesystem> |