diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 10:39:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 10:39:11 +0200 |
| commit | 98a70cea3c1e996c341382834f8396794b2d67f1 (patch) | |
| tree | 0bd1cd8faad15664f195c37b1c987d85a2281a4a /sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | |
| parent | 4f4716ace2c114e1565359f5eeacd1cf19542b2d (diff) | |
| parent | 700727855c8f5337a0901536b0a65cd608b40b28 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I81270510e3a27915781a50769bb627e666970142
Diffstat (limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 1240e13c0..63028057e 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -3686,7 +3686,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"> |