diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-11 08:43:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-11 11:30:14 +0200 |
| commit | 27898323500ebc6dcb639b6e153e2474c1ebbf7a (patch) | |
| tree | f2dd9a5cc86379bd98c9e822d0463fd775af0baf /sources/pyside2 | |
| parent | ee8f8e9801c0caf2c49b0a40a21f3b5ae444cf15 (diff) | |
| parent | ec73fb39a784be871a28d1eaf93954ee7ac98bd7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 6 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 9ffc7d376..92a4f41c4 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2544,12 +2544,6 @@ <include file-name="QtCore/QtCore" location="global"/> </extra-includes> - <modify-function signature="setDevice(QIODevice*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <!-- ### Replaced by write<TYPE> methods --> <modify-function signature="operator>>(qint8&)" remove="all"/> <modify-function signature="operator>>(bool&)" remove="all"/> diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index 78c9171c6..93c9fe6be 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -41,6 +41,7 @@ major_version = "5" minor_version = "13" patch_version = "2" + # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). # An empty string means the generated package will be an official release. |