aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-03-18 16:05:08 +0100
committerAapo Keskimolo <aapo.keskimolo@qt.io>2019-03-20 17:28:14 +0000
commitac18465cc0f350405dc15806ee60c556ab5a6794 (patch)
tree4e284685533e69a9fad8e7a9cbb99a88f1da80b9 /sources/pyside2/PySide2
parent2e327c6f3ccec91c291dfe251823a8520fa280a1 (diff)
PySide2/QtGui: Temporarily work around link error
Remove a function introduced by qtbase/1bfabe35d8178c93e66acef21c01e08980f9ed0d whose implementation is missing. This will be fixed by qtbase/1bfabe35d8178c93e66acef21c01e08980f9ed0d. TODO sth else wrong with Q3DInput::QMouseEvent::Modifiers Change-Id: I117915053c6be7aa2c7d0cb1db08cab1edd89108 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2')
-rw-r--r--sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index eaff93345..2c14fe35a 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2925,6 +2925,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"/>