diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-21 08:43:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-21 08:43:01 +0200 |
| commit | 98eb59226aca550ae086c00b9c8023f47c44d2b2 (patch) | |
| tree | 7e8a136347b5eb52ca0592b33aea09af97bf978a /sources/pyside2/PySide2 | |
| parent | 968e9adeccddfc7e3bc376e7b7606b376d8feecf (diff) | |
| parent | 8728594d6b2e0f3df3e3726b67cf23715dfdcbe3 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia31df23a16575f9ecefe13ec85fb70197d103278
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml index 30c190b66..61b128f73 100644 --- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml +++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml @@ -42,7 +42,7 @@ <typesystem package="PySide2.Qt3DCore"> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <namespace-type name="Qt3DCore"> + <namespace-type name="Qt3DCore" generate-using="no"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> <object-type name="QAbstractAspect"/> <object-type name="QAbstractFrontEndNodeManager" since="6.0"> diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml index 85092a5c2..31f0b8343 100644 --- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml +++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml @@ -90,6 +90,7 @@ <modify-function signature="createAction(QObject*,const QString&)"> <modify-argument index="return"> <parent index="1" action="add"/> + <define-ownership class="native" owner="c++"/> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> @@ -97,6 +98,7 @@ <modify-function signature="createActionGroup(QObject*,const QString&)"> <modify-argument index="return"> <parent index="1" action="add"/> + <define-ownership class="native" owner="c++"/> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> @@ -104,6 +106,7 @@ <modify-function signature="createLayout(const QString&,QObject*,const QString&)"> <modify-argument index="return"> <parent index="2" action="add"/> + <define-ownership class="native" owner="c++"/> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> @@ -111,6 +114,7 @@ <modify-function signature="createWidget(const QString&,QWidget*,const QString&)"> <modify-argument index="return"> <parent index="2" action="add"/> + <define-ownership class="native" owner="c++"/> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> |