aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-09-06 10:18:48 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-09-06 10:38:27 +0000
commit534372a13e4d5d8eb0d6f47667562c810118849a (patch)
tree1dda0ca04e772884037470a66a36f97ea26b9564
parent3fd89cd65e7e45b3661bc58bfe93a1220aba97d3 (diff)
PySide2: Add some enumerations that were overlooked before
Change-Id: I038ac183e70c27929837ff93b5921c2dbe00f48b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml4
-rw-r--r--sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml1
-rw-r--r--sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml4
-rw-r--r--sources/pyside2/PySide2/QtQuick/typesystem_quick.xml1
-rw-r--r--sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml4
5 files changed, 11 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
index daa9c2465..fb7a83ba7 100644
--- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
+++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
@@ -78,7 +78,9 @@
<enum-type name="DeliveryFlag" flags="DeliveryFlags"/>
</object-type>
<object-type name="QSkeleton" since="5.10"/>
- <object-type name="QSkeletonLoader" since="5.10"/>
+ <object-type name="QSkeletonLoader" since="5.10">
+ <enum-type name="Status"/>
+ </object-type>
<object-type name="QStaticPropertyUpdatedChangeBase"/>
<object-type name="QStaticPropertyValueAddedChangeBase"/>
<object-type name="QStaticPropertyValueRemovedChangeBase"/>
diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
index 5fe0ac435..35054db36 100644
--- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
+++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
@@ -84,6 +84,7 @@
</object-type>
<object-type name="QBuffer">
<enum-type name="AccessType"/>
+ <enum-type name="BufferType"/>
<enum-type name="UsageType"/>
</object-type>
<object-type name="QBufferCapture"/>
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 7715cbe6c..70fd1692a 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -3695,7 +3695,9 @@
<modify-function signature="borderColor(int*)const" remove="all"/>
<modify-function signature="borderColor(float*)const" remove="all"/>
</object-type>
- <object-type name="QOpenGLTextureBlitter"/>
+ <object-type name="QOpenGLTextureBlitter">
+ <enum-type name="Origin"/>
+ </object-type>
<object-type name="QOpenGLTimeMonitor" since="5.1"/>
<object-type name="QOpenGLTimerQuery" since="5.1"/>
<object-type name="QOpenGLWindow" since="5.4">
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index e867c0c05..7e6b450c9 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -104,6 +104,7 @@
<enum-type name="CreateTextureOption" flags="CreateTextureOptions" />
<enum-type name="RenderStage" />
<enum-type name="SceneGraphError" />
+ <enum-type name="TextRenderType" since="5.10"/>
</object-type>
<object-type name="QSGAbstractRenderer">
diff --git a/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml b/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml
index 59e66cc25..5958f5a99 100644
--- a/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml
+++ b/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml
@@ -43,5 +43,7 @@
<typesystem package="PySide2.QtX11Extras">
<load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
- <object-type name="QX11Info" />
+ <object-type name="QX11Info">
+ <enum-type name="PeekOption" flags="PeekOptions" since="5.10"/>
+ </object-type>
</typesystem>