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 | |
| parent | ee8f8e9801c0caf2c49b0a40a21f3b5ae444cf15 (diff) | |
| parent | ec73fb39a784be871a28d1eaf93954ee7ac98bd7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
| -rw-r--r-- | dist/changes-5.12.5 | 40 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 6 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 1 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 1 |
4 files changed, 42 insertions, 6 deletions
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 000000000..d463b8324 --- /dev/null +++ b/dist/changes-5.12.5 @@ -0,0 +1,40 @@ + +Qt for Python 5.12.5 is a bug-fix release. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qtforpython/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* PySide2 * +**************************************************************************** + + - [PYSIDE-571] Support the qApp macro in "scriptable application" + - [PYSIDE-634] Add support for parameterNames in Signals + - [PYSIDE-951] Correct QtPrintSupport dependency + - [PYSIDE-1010] Add optional support for types in QSettings::value + - [PYSIDE-1020] Fix pyside2-uic to generate correct code for QWebview and QQuickWidget + - [PYSIDE-1028] Leave QVariantMap as a name, not a type + - [PYSIDE-1029] Fix type name for lookup of QFlags<> converters + - [PYSIDE-1032] Use default compiler on macOS + - [PYSIDE-1035] Fix pyside2-uic to generate correct code for QTableWidget + - [PYSIDE-1066] Fix Xcode sdk value embedded into PySide2 binaries + + +**************************************************************************** +* Shiboken2 * +**************************************************************************** + + - [PYSIDE-1024] shiboken: Generate code for smart pointers only within declaring package + - [PYSIDE-1037] shiboken: Allow for "auto" as target of type for CONVERTTOCPP in injected code + + 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. diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 78c9171c6..93c9fe6be 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_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. |