diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-23 14:32:38 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-02 08:48:43 +0000 |
commit | 82934bc00c2de7ea51fd7e95601472fcdf7b6aea (patch) | |
tree | cecc2542b0c18c5160cd5fb656f684327336352f /sources/pyside2/PySide2/QtWidgets | |
parent | 908c89e9c08297ca854e7c2064b93368d215d0b2 (diff) |
Adapt to recent changes in qtbase
- Remove QProcess::pid(), adapt test
(qtbase/0f8848b7e25e4d8fb9265ff6e0aa31946addd741)
- Remove enum from QPrinter
- Add enum GrabTransition to QPointingDevice
- Remove deprecated functions from QByteArray, QXmlStreamAttributes
- Adapt Qml tests
- Remove fake property from QLayout
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I98cc90723cbeda15b23c5b22d026cb2ab9a358ff
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtWidgets')
-rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index be53f97de..d067e1aba 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -1182,8 +1182,6 @@ <object-type name="QLayout"> <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlayout-help-functions"/> - <!-- Becomes a real Q_OPROPERTY in Qt 6 --> - <property name="contentsMargins" type="QMargins" get="contentsMargins" set="setContentsMargins"/> <enum-type name="SizeConstraint"/> <modify-function signature="itemAt(int)const"> |