diff options
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | 6 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 10 |
2 files changed, 8 insertions, 8 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"> diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index a883bab96..f104f09e6 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -40,8 +40,14 @@ major_version = "5" minor_version = "12" patch_version = "0" -pre_release_version_type = "a" # e.g. "a", "b", "rc". -pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") + +# For example: "a", "b", "rc" +# (which means "alpha", "beta", "release candidate"). +# An empty string means the generated package will be an official release. +pre_release_version_type = "a" + +# For example: "1", "2" (which means "beta1", "beta2", if type is "b"). +pre_release_version = "1" if __name__ == '__main__': # Used by CMake. |