diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')
-rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index efb68a310..b1090b651 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -480,6 +480,7 @@ </value-type> <value-type name="QTextBlockFormat"> <enum-type name="LineHeightTypes" since="4.8" revision="4800"/> + <enum-type name="MarkerType" since="5.14"/> </value-type> <value-type name="QTextTableCellFormat"/> <value-type name="QTextCharFormat" > @@ -1094,6 +1095,13 @@ </inject-code> </modify-function> </value-type> + + <value-type name="QColorSpace" since="5.14"> + <enum-type name="NamedColorSpace"/> + <enum-type name="Primaries"/> + <enum-type name="TransferFunction"/> + </value-type> + <value-type name="QFontMetricsF" > <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar"> @@ -1117,6 +1125,7 @@ <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> <modify-argument index="5"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetricsf-boundingrect"/> </modify-function> @@ -1124,6 +1133,7 @@ <modify-function signature="size(int,QString,int,int*)const"> <modify-argument index="4"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetricsf-size"/> </modify-function> @@ -1150,7 +1160,8 @@ <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> <modify-argument index="8"> - <replace-type modified-type="PyObject"/> + <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-boundingrect-1"/> </modify-function> @@ -1158,6 +1169,7 @@ <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> <modify-argument index="5"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-boundingrect-2"/> </modify-function> @@ -1165,6 +1177,7 @@ <modify-function signature="size(int,QString,int,int*)const"> <modify-argument index="4"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-size"/> </modify-function> @@ -1744,6 +1757,7 @@ <include file-name="QTextCursor" location="global"/> </extra-includes> <enum-type name="FindFlag" flags="FindFlags"/> + <enum-type name="MarkdownFeature" flags="MarkdownFeatures" since="5.14"/> <enum-type name="MetaInformation"/> <enum-type name="ResourceType"/> <enum-type name="Stacks" since="4.7"/> @@ -1935,6 +1949,7 @@ <value-type name="QMatrix2x2" since="4.6"> <modify-function signature="QMatrix2x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -1971,6 +1986,7 @@ <value-type name="QMatrix2x3" since="4.6"> <modify-function signature="QMatrix2x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2007,6 +2023,7 @@ <value-type name="QMatrix2x4" since="4.6"> <modify-function signature="QMatrix2x4(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2043,6 +2060,7 @@ <value-type name="QMatrix3x2" since="4.6"> <modify-function signature="QMatrix3x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2079,6 +2097,7 @@ <value-type name="QMatrix3x3" since="4.6"> <modify-function signature="QMatrix3x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2115,6 +2134,7 @@ <value-type name="QMatrix3x4" since="4.6"> <modify-function signature="QMatrix3x4(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2151,6 +2171,7 @@ <value-type name="QMatrix4x2" since="4.6"> <modify-function signature="QMatrix4x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2187,6 +2208,7 @@ <value-type name="QMatrix4x3" since="4.6"> <modify-function signature="QMatrix4x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2267,6 +2289,7 @@ <modify-function signature="QMatrix4x4(const float*)"> <modify-argument index="1"> <replace-type modified-type="PySequence"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qmatrix4x4"/> </modify-function> @@ -2734,7 +2757,7 @@ <modify-argument index="3"><array/></modify-argument> </modify-function> <modify-function signature="^glTexParameterI?u?[fi]v\(.*$"> - <modify-argument index="3"><array/></modify-argument> + <modify-argument index="3"><array/></modify-argument> </modify-function> <modify-function signature="glUniform1uiv(int,int,const unsigned int*)"> <modify-argument index="3"><array/></modify-argument> @@ -2949,6 +2972,9 @@ <modify-function signature="borderColor(unsigned int*)const" remove="all"/> <modify-function signature="borderColor(int*)const" remove="all"/> <modify-function signature="borderColor(float*)const" remove="all"/> + <!-- Work around link error introduced by qtbase/d15b02ff291e3124d9bb8ac3b06b704c292f52ab, can be removed once + qtbase/1bfabe35d8178c93e66acef21c01e08980f9ed0d has landed --> + <modify-function signature="setData(int,int,int,int,int,int,int,QOpenGLTexture::PixelFormat,QOpenGLTexture::PixelType,const void*,QOpenGLPixelTransferOptions*const)" remove="all"/> </object-type> <object-type name="QOpenGLTextureBlitter"> <enum-type name="Origin"/> |