diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-11-02 13:19:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-11-02 15:10:08 +0100 |
| commit | 1a63e46e7e7bdd4d12eada16c028743fb88a9a12 (patch) | |
| tree | df27786a58d568b256bf5b37bb0fb34e6b9d512d /sources | |
| parent | ed40f18ee3a0f2b68fda3fe7b78f753ffa6d791b (diff) | |
PySide6: Fix Desktop/GLES switching
- remove qopenglfunctions_es2.h from extra includes of
QOpenGLVersionFunctionsFactory. It is not needed and causes errors
after syncqt refactorings.
- Add QOpenGLFunctions_ES2 to dropped entries for Desktop GL.
Pick-to: 6.4
Task-number: QTBUG-103196
Change-Id: Ib8cb98f11b9d9b8e9fe39ee9d40b6d03005b6854
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt index e22b768e4..ed2e9a2c4 100644 --- a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt @@ -36,6 +36,7 @@ if("opengles2" IN_LIST QtGui_enabled_features) list(APPEND QtOpenGL_SRC ${QtOpenGL_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp) message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)") else() + list(APPEND QtOpenGL_DROPPED_ENTRIES QOpenGLFunctions_ES2) list(APPEND QtOpenGL_SRC ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_0_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopenglfunctions_1_1_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml index 22769ac25..4fd7f7f24 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -608,7 +608,6 @@ <include file-name="QtOpenGL/qopenglfunctions_4_4_core.h" location="global"/> <include file-name="QtOpenGL/qopenglfunctions_4_5_compatibility.h" location="global"/> <include file-name="QtOpenGL/qopenglfunctions_4_5_core.h" location="global"/> - <include file-name="QtOpenGL/qopenglfunctions_es2.h" location="global"/> </extra-includes> <modify-function signature="get(const QOpenGLVersionProfile &,QOpenGLContext *)"> <inject-code class="target" position="beginning" file="../glue/qtopengl.cpp" |