diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-07 20:24:04 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-07 20:24:04 +0100 |
| commit | 4207871c7f570f1ce3e268b9255b4d3c120cb247 (patch) | |
| tree | c49547d92ad54833c3c62601bcaeaf361bca15d4 /sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | |
| parent | 43a1ec89d8cc4a9d90069038980c2f2074cc28ea (diff) | |
| parent | b0fbd9ea719b7827fe0eb37c6cc64365de491aae (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iea80162c5b4a1a9692680d5e85760d2ecfdb4e17
Diffstat (limited to 'sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | 6 |
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 bb8a30234..a976c42fc 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"> |