aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-12-07 20:24:04 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-12-07 20:24:04 +0100
commit4207871c7f570f1ce3e268b9255b4d3c120cb247 (patch)
treec49547d92ad54833c3c62601bcaeaf361bca15d4 /sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
parent43a1ec89d8cc4a9d90069038980c2f2074cc28ea (diff)
parentb0fbd9ea719b7827fe0eb37c6cc64365de491aae (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Diffstat (limited to 'sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml')
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index bb8a3023..a976c42f 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -282,12 +282,6 @@
</modify-argument>
<inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
</modify-function>
- <modify-function signature="setVideoOutput(QAbstractVideoSurface*)">
- <modify-argument index="1">
- <replace-type modified-type="QObject *"/>
- </modify-argument>
- <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
- </modify-function>
</object-type>
<object-type name="QMediaPlayerControl"/>
<object-type name="QMediaPlaylist">