aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-05-18 16:45:35 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-05-18 16:45:35 +0200
commit3f8c8702ea295f39357e7c66f46e5138f56bcc9f (patch)
tree9ca65a7f94d544ba4b36f239c4a48852ad8a7b09 /sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
parent5fce76074c01e52a22151133a1e3a2cf71cfe535 (diff)
parentdf1a619d65d8e5db91f3c8db46b00872b461e334 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11
Diffstat (limited to 'sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml')
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml23
1 files changed, 23 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index fb353c7a..5486fb15 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -217,6 +217,9 @@
<enum-type name="ExposureParameter"/>
<modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/>
</object-type>
+ <object-type name="QCameraFeedbackControl">
+ <enum-type name="EventType"/>
+ </object-type>
<value-type name="QCameraFocusZone">
<enum-type name="FocusZoneStatus"/>
</value-type>
@@ -225,6 +228,8 @@
<enum-type name="FocusMode" flags="FocusModes"/>
<enum-type name="FocusPointMode"/>
</object-type>
+ <object-type name="QCameraFlashControl"/> needs enums from QCameraFocus
+ <object-type name="QCameraFocusControl"/>
-->
<value-type name="QCameraInfo"/>
<object-type name="QCameraInfoControl"/>
@@ -313,7 +318,25 @@
</object-type>
<object-type name="QMediaRecorderControl"/>
<value-type name="QMediaResource"/>
+ <object-type name="QMediaService"/>
+ <interface-type name="QMediaServiceCameraInfoInterface"/>
+ <interface-type name="QMediaServiceDefaultDeviceInterface"/>
+ <interface-type name="QMediaServiceFeaturesInterface"/>
+ <value-type name="QMediaServiceProviderHint">
+ <enum-type name="Type"/>
+ <enum-type name="Feature" flags="Features"/>
+ </value-type>
+ <interface-type name="QMediaServiceSupportedDevicesInterface"/>
+ <interface-type name="QMediaServiceSupportedFormatsInterface"/>
+ <object-type name="QMediaStreamsControl">
+ <enum-type name="StreamType"/>
+ </object-type>
+ <value-type name="QMediaTimeInterval"/>
<value-type name="QMediaTimeRange"/>
+ <object-type name="QMediaVideoProbeControl"/>
+
+ <object-type name="QMetaDataReaderControl"/>
+ <object-type name="QMetaDataWriterControl"/>
<namespace-type name="QMultimedia">
<enum-type name="SupportEstimate"/>