AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid including qopenglfunctions header files if Qt is built with GLES2

Browse Source 
Change-Id: I3a7a69f5eef604408713934811efb984e78d68dd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2022-06-01 13:03:07 +02:00
parent f814cc6a79
commit d4b27d9b52
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/opengl/qopenglvertexarrayobject.cpp
View File

@ -10,8 +10,11 @@
#include <QtGui/qguiapplication.h> #include <QtGui/qguiapplication.h>
#include <QtOpenGL/QOpenGLVersionFunctionsFactory> #include <QtOpenGL/QOpenGLVersionFunctionsFactory>
#if !QT_CONFIG(opengles2)
# include <QtOpenGL/qopenglfunctions_3_0.h> # include <QtOpenGL/qopenglfunctions_3_0.h>
# include <QtOpenGL/qopenglfunctions_3_2_core.h> # include <QtOpenGL/qopenglfunctions_3_2_core.h>
#endif
#include <private/qopenglcontext_p.h> #include <private/qopenglcontext_p.h>
#include <private/qopenglextensions_p.h> #include <private/qopenglextensions_p.h>

2
tests/auto/gui/qopengl/tst_qopengl.cpp
View File

@ -7,7 +7,9 @@
#include <QtOpenGL/qopengltextureblitter.h> #include <QtOpenGL/qopengltextureblitter.h>
#include <QtOpenGL/QOpenGLVertexArrayObject> #include <QtOpenGL/QOpenGLVertexArrayObject>
#include <QtOpenGL/QOpenGLBuffer> #include <QtOpenGL/QOpenGLBuffer>
#if !QT_CONFIG(opengles2)
# include <QtOpenGL/QOpenGLFunctions_4_2_Core> # include <QtOpenGL/QOpenGLFunctions_4_2_Core>
#endif
#include <QtOpenGL/QOpenGLVersionFunctionsFactory> #include <QtOpenGL/QOpenGLVersionFunctionsFactory>
#include <QtGui/private/qopenglcontext_p.h> #include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>