summaryrefslogtreecommitdiffstats
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
parent43a1ec89d8cc4a9d90069038980c2f2074cc28ea (diff)
parentb0fbd9ea719b7827fe0eb37c6cc64365de491aae (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml6
-rw-r--r--sources/pyside2/pyside_version.py10
-rw-r--r--sources/shiboken2/shiboken_version.py8
3 files changed, 16 insertions, 8 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">
diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py
index a883bab9..f104f09e 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.
diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py
index a883bab9..8df1c299 100644
--- a/sources/shiboken2/shiboken_version.py
+++ b/sources/shiboken2/shiboken_version.py
@@ -43,6 +43,14 @@ 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.
print('{0};{1};{2};{3};{4}'.format(major_version, minor_version, patch_version,