diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 07:39:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 07:49:07 +0200 |
| commit | 9881b68c4c7bc1715cd266c41c63a3a918d83b07 (patch) | |
| tree | 5252e3e767e64d98383f6103d9d5941a206a52bc /sources/pyside2/PySide2 | |
| parent | 17a20f95151368a3b92b949b905325865643ca45 (diff) | |
| parent | cad869b619fdc0969216e6e9b63fd1afb5edb7db (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7e4c7f9378706438715362b1e2da9a3cd2794562
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 11 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index c6393a1aa..7885af343 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -34,6 +34,8 @@ ${QtGui_GEN_DIR}/qclipboard_wrapper.cpp ${QtGui_GEN_DIR}/qcloseevent_wrapper.cpp ${QtGui_GEN_DIR}/qcolor_wrapper.cpp ${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp +${QtGui_GEN_DIR}/qcolorconstants_wrapper.cpp +${QtGui_GEN_DIR}/qcolorconstants_svg_wrapper.cpp ${QtGui_GEN_DIR}/qconicalgradient_wrapper.cpp ${QtGui_GEN_DIR}/qcontextmenuevent_wrapper.cpp ${QtGui_GEN_DIR}/qcursor_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index a096cb0b4..f3456e646 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -1001,6 +1001,17 @@ </modify-function> </value-type> + <namespace-type name="QColorConstants" since="5.14"> + <extra-includes> + <include file-name="QColor" location="global"/> + </extra-includes> + <namespace-type name="Svg" since="5.14"> + <extra-includes> + <include file-name="QColor" location="global"/> + </extra-includes> + </namespace-type> + </namespace-type> + <value-type name="QColorSpace" since="5.14"> <enum-type name="NamedColorSpace"/> <enum-type name="Primaries"/> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 6347c9394..be53f97de 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -1182,7 +1182,8 @@ <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"> @@ -1211,6 +1212,7 @@ <modify-function signature="takeAt(int)"> <modify-argument index="return"> <parent index="this" action="remove"/> + <define-ownership class="native" owner="c++"/> </modify-argument> </modify-function> |