diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-26 11:28:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-26 13:32:09 +0000 |
| commit | 7fb84b6d1c5f1f7cf99f27a7ce46cc8e1e9d06dc (patch) | |
| tree | 6518916dd688f99a569533b09d465fcd03176037 /sources | |
| parent | dcbcf22c737d4a9b882ea9e08debda21a64f4f8a (diff) | |
PySide6: Adapt QtMultimedia to current state
Fix to build with the wip/qt6 branch at
qtmultimedia/ef2d075b357464d3d6ae1c963b1a419bd3121241.
Task-number: PYSIDE-1570
Change-Id: I18c266f89a6d775bc0edb55f17b99e6cd1e4dc7f
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 7a306a5d12ef04ab4a915016b651c4c182b94f13)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml | 19 |
2 files changed, 5 insertions, 17 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt index a005667cb..06342cdd2 100644 --- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt @@ -8,11 +8,8 @@ ${QtMultimedia_GEN_DIR}/qaudioformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp -${QtMultimedia_GEN_DIR}/qcameraexposure_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp -${QtMultimedia_GEN_DIR}/qcamerafocus_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimagecapture_wrapper.cpp -${QtMultimedia_GEN_DIR}/qcameraimageprocessing_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerainfo_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp ${QtMultimedia_GEN_DIR}/qimageencodersettings_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index 54f440880..7d6f2854f 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -90,30 +90,21 @@ <object-type name="QCamera"> <enum-type name="Error"/> + <enum-type name="ExposureMode" since="6.1"/> + <enum-type name="Feature" flags="Features" since="6.1"/> + <enum-type name="FlashMode" since="6.1"/> + <enum-type name="FocusMode" since="6.1"/> <enum-type name="Status"/> - </object-type> - <object-type name="QCameraExposure"> - <enum-type name="FlashMode"/> - <enum-type name="ExposureMode"/> <enum-type name="TorchMode" since="6.1"/> - <modify-function signature="supportedApertures(bool*)const" remove="all"/> - <modify-function signature="supportedIsoSensitivities(bool*)const" remove="all"/> - <modify-function signature="supportedShutterSpeeds(bool*)const" remove="all"/> + <enum-type name="WhiteBalanceMode" since="6.1"/> </object-type> <value-type name="QCameraFormat" since="6.1"/> - <object-type name="QCameraFocus"> - <enum-type name="FocusMode"/> - </object-type> <value-type name="QCameraInfo"> <enum-type name="Position" since="6.1"/> </value-type> <object-type name="QCameraImageCapture"> <enum-type name="Error"/> </object-type> - <object-type name="QCameraImageProcessing"> - <enum-type name="WhiteBalanceMode"/> - <enum-type name="ColorFilter"/> - </object-type> <value-type name="QImageEncoderSettings"> <enum-type name="FileFormat" since="6.1"/> |