1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix define indentation in qopengl.h

Browse Source 
Change-Id: I7894fcadf1a0abecbd8206abae1b035c823d52c4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-07-01 13:33:49 +02:00
parent da7f4a4c76
commit fecfa0a014
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/opengl/qopengl.h
View File

@ -109,12 +109,12 @@ typedef void* GLeglImageOES;
# include <GLES3/gl3.h> # include <GLES3/gl3.h>
# else # else
# include <GLES2/gl2.h> # include <GLES2/gl2.h>
#endif # endif
# ifdef QGL_TEMP_GLEXT_PROTO # ifdef QGL_TEMP_GLEXT_PROTO
# undef GL_GLEXT_PROTOTYPES # undef GL_GLEXT_PROTOTYPES
# undef QGL_TEMP_GLEXT_PROTO # undef QGL_TEMP_GLEXT_PROTO
# endif # endif
/* /*
Some GLES2 implementations (like the one on Harmattan) are missing the Some GLES2 implementations (like the one on Harmattan) are missing the
@ -125,9 +125,9 @@ typedef void* GLeglImageOES;
typedef char GLchar; typedef char GLchar;
# include <QtGui/qopengles2ext.h> # include <QtGui/qopengles2ext.h>
# endif // Q_OS_MAC # endif
#else // non-ES2 platforms #else // non-ES2 platforms
# if defined(Q_OS_MAC) # if defined(Q_OS_MACOS)
# include <OpenGL/gl.h> # include <OpenGL/gl.h>
# define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED # define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
# include <OpenGL/gl3.h> # include <OpenGL/gl3.h>
@ -144,7 +144,7 @@ typedef char GLchar;
# include <GL/gl.h> # include <GL/gl.h>
# endif # endif
# include <QtGui/qopenglext.h> # include <QtGui/qopenglext.h>
# endif // Q_OS_MAC # endif
#endif // !QT_CONFIG(opengles2) #endif // !QT_CONFIG(opengles2)
// Desktops can support OpenGL 4. // Desktops can support OpenGL 4.