diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-11 12:55:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-11 23:30:45 +0200 |
| commit | 833e38e6cb2671c3c197b19f4b64c005c16a12c1 (patch) | |
| tree | 873a4b5759092232b8ca410d0055e2164aef258a /sources | |
| parent | fd212e9c380960c914476d077c700b4e3cfda9ee (diff) | |
Add QOpenGLPaintDevice
[ChangeLog][PySide2] QOpenGLPaintDevice has been added.
Fixes: PYSIDE-1090
Change-Id: Ia476a810f65956b73c28b1bed41da87bc28443f3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index c4a38a184..88d8be93f 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -100,7 +100,7 @@ ${QtGui_GEN_DIR}/qopengldebugmessage_wrapper.cpp ${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp ${QtGui_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp ${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp -# Compile error on Windows: ${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp +${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp ${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp ${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp ${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index c2109cae7..e66ee48ce 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -2642,9 +2642,7 @@ <enum-type name="FramebufferRestorePolicy" since="5.7"/> </object-type> <value-type name="QOpenGLFramebufferObjectFormat"/> - <!-- Compile error on Windows: QOpenGLPaintDevice::QOpenGLPaintDevice(const QOpenGLPaintDevice &)': attempting to reference a deleted function <object-type name="QOpenGLPaintDevice" since="5.0"/> - --> <object-type name="QOpenGLExtraFunctions" since="5.6"> <!-- Exlusions due to compile errors --> <modify-function signature="glEndTransformFeedback()" remove="all"/> |