diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-01 12:32:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 12:56:29 +0200 |
| commit | 155a2608309f44757bfa6433a44129e306cd5cce (patch) | |
| tree | 831eebaf0fb38559fb2130e20f537458488270d4 | |
| parent | 3a7856eb4b129449da8fd3c9b7185a4cb2d9cc68 (diff) | |
Enable multimedia classes after API fixup
Change-Id: I58e14a919fdf8cb297bed8e91d964c3767c0b98c
Fixes: PYSIDE-1041
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt index 4e7642d3a..cbdd9a1c2 100644 --- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt @@ -26,16 +26,16 @@ ${QtMultimedia_GEN_DIR}/qcameracapturebufferformatcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameracapturedestinationcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameracontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraexposurecontrol_wrapper.cpp -# Private destructor: ${QtMultimedia_GEN_DIR}/qcameraexposure_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcameraexposure_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerafeedbackcontrol_wrapper.cpp -# Private destructor: ${${QtMultimedia_GEN_DIR}/qcamerafocus_wrapper.cpp -# needs enums from QCameraFocus ${QtMultimedia_GEN_DIR}/qcameraflashcontrol_wrapper.cpp -# needs enums from QCameraFocus ${QtMultimedia_GEN_DIR}/qcamerafocuscontrol_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcamerafocus_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcameraflashcontrol_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcamerafocuscontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerafocuszone_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamera_frameraterange_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimagecapturecontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimagecapture_wrapper.cpp -# Private destructor: ${QtMultimedia_GEN_DIR}/qcameraimageprocessing_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcameraimageprocessing_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimageprocessingcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerainfocontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerainfo_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index f7ac67857..d44c89e96 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -193,7 +193,6 @@ <object-type name="QCameraControl"> <enum-type name="PropertyChangeType"/> </object-type> - <!-- Private destructor <object-type name="QCameraExposure"> <enum-type name="FlashMode" flags="FlashModes"/> <enum-type name="ExposureMode"/> @@ -202,7 +201,6 @@ <modify-function signature="supportedIsoSensitivities(bool*)const" remove="all"/> <modify-function signature="supportedShutterSpeeds(bool*)const" remove="all"/> </object-type> - --> <object-type name="QCameraExposureControl"> <enum-type name="ExposureParameter"/> <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/> @@ -213,14 +211,12 @@ <value-type name="QCameraFocusZone"> <enum-type name="FocusZoneStatus"/> </value-type> - <!-- Private destructor <object-type name="QCameraFocus"> <enum-type name="FocusMode" flags="FocusModes"/> <enum-type name="FocusPointMode"/> </object-type> - <object-type name="QCameraFlashControl"/> needs enums from QCameraFocus + <object-type name="QCameraFlashControl"/> <object-type name="QCameraFocusControl"/> - --> <value-type name="QCameraInfo"/> <object-type name="QCameraInfoControl"/> <object-type name="QCameraImageCapture"> @@ -230,12 +226,10 @@ <modify-function signature="supportedResolutions(const QImageEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QCameraImageCaptureControl"/> - <!-- Private destructor <object-type name="QCameraImageProcessing"> <enum-type name="WhiteBalanceMode"/> <enum-type name="ColorFilter"/> </object-type> - --> <object-type name="QCameraImageProcessingControl"> <enum-type name="ProcessingParameter"/> </object-type> |