diff options
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml | 4 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml index a74c3ab93..1c7e1109b 100644 --- a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml +++ b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml @@ -73,11 +73,11 @@ </object-type> <object-type name="QMouseEvent"> <enum-type name="Buttons"/> - <enum-type name="Modifiers"/> + <enum-type name="Modifier" flags="Modifiers" since="5.14"/> </object-type> <object-type name="QWheelEvent"> <enum-type name="Buttons"/> - <enum-type name="Modifiers"/> + <enum-type name="Modifier" flags="Modifiers" since="5.14"/> </object-type> <object-type name="QMouseHandler"/> <!-- On windows this raise the following error: diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index efb68a310..95b85a918 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -2949,6 +2949,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"/> |