aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtQuick
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-09-07 10:39:07 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-09-07 10:39:11 +0200
commit98a70cea3c1e996c341382834f8396794b2d67f1 (patch)
tree0bd1cd8faad15664f195c37b1c987d85a2281a4a /sources/pyside2/PySide2/QtQuick
parent4f4716ace2c114e1565359f5eeacd1cf19542b2d (diff)
parent700727855c8f5337a0901536b0a65cd608b40b28 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'sources/pyside2/PySide2/QtQuick')
-rw-r--r--sources/pyside2/PySide2/QtQuick/typesystem_quick.xml1
1 files changed, 1 insertions, 0 deletions
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">