diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-07 15:29:44 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-12-07 16:01:30 +0100 |
commit | b0fbd9ea719b7827fe0eb37c6cc64365de491aae (patch) | |
tree | 28d870b65670c2b94023074cd0a87bb1ea93fe89 | |
parent | 08a99cb66d9766d9b7801a51986f49e49269ef33 (diff) | |
parent | 4018787a3cc01d632fdca7891ac8aa9487110c26 (diff) |
Merge remote-tracking branch 'origin/5.11.3' into 5.115.11
Change-Id: I7d67c64e7c6f58fb3907bcac6f4cf7342ffc3552
-rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | 11 | ||||
-rw-r--r-- | sources/pyside2/pyside_version.py | 2 | ||||
-rw-r--r-- | sources/shiboken2/shiboken_version.py | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index 6fe90ccb9..5486fb157 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< %ARG1_TYPE >(upcastedArg)); - %END_ALLOW_THREADS - </inject-code> - </modify-function> </object-type> <object-type name="QMediaPlayerControl"/> <object-type name="QMediaPlaylist"> diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index 360e4eb07..709dd8714 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "11" -patch_version = "3" +patch_version = "4" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 360e4eb07..709dd8714 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "11" -patch_version = "3" +patch_version = "4" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). |