summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2018-12-06 12:03:56 +0100
committerCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2018-12-07 12:16:55 +0000
commit4018787a3cc01d632fdca7891ac8aa9487110c26 (patch)
tree0da27267ab317d6c931b047dcc16dea7c4d2ef11
parent572103e010c288b83f7dd73709739f790195dd8c (diff)
Revert QAbstractVideoSurface patch5.11.3
This will re-open PYSIDE-794, but it was a wrong solution that was breaking the other setVideoOutput signatures, causing a sefault on the `player` example. Change-Id: I31d7449ff11e4e44e8494b98d7e9ec58a636c8e4 Fixes: PYSIDE-864 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index 6fe90ccb..5486fb15 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -302,17 +302,6 @@
%END_ALLOW_THREADS
</inject-code>
</modify-function>
- <modify-function signature="setVideoOutput(QAbstractVideoSurface*)">
- <modify-argument index="1">
- <replace-type modified-type="QObject *" />
- </modify-argument>
- <inject-code class="target" position="beginning">
- %BEGIN_ALLOW_THREADS
- QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1);
- %CPPSELF.%FUNCTION_NAME(reinterpret_cast&lt; %ARG1_TYPE &gt;(upcastedArg));
- %END_ALLOW_THREADS
- </inject-code>
- </modify-function>
</object-type>
<object-type name="QMediaPlayerControl"/>
<object-type name="QMediaPlaylist">