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

Simplify OpenGL and OpenGL ES2 library tests in Gui's configure.json

Browse Source 
Change OpenGL and OpenGL ES2 library tests to just include the header
file in the test header code. This mimics what the OpenGL ES3 library
tests does.

Change-Id: Ic63879ea100bc66cf58ffd660e89c5803c6e29e6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-03-05 15:32:05 +01:00
parent 627351f561
commit a64f4b4052
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/configure.json
View File

@ -442,6 +442,7 @@
"# include <OpenGL/gl.h>",
"#else",
"# define GL_GLEXT_PROTOTYPES",
"# include <GL/gl.h>",
"#endif"
],
"main": [
@ -452,12 +453,6 @@
"glEnd();"
]
},
"headers": [
{
"condition": "!config.darwin",
"headers": "GL/gl.h"
}
],
"sources": [
{ "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" },
{ "type": "makeSpec", "spec": "OPENGL" }
@ -471,6 +466,7 @@
"# include <OpenGLES/ES2/gl.h>",
"#else",
"# define GL_GLEXT_PROTOTYPES",
"# include <GLES2/gl2.h>",
"#endif"
],
"main": [
@ -478,12 +474,6 @@
"glClear(GL_COLOR_BUFFER_BIT);"
]
},
"headers": [
{
"condition": "!config.darwin",
"headers": "GLES2/gl2.h"
}
],
"sources": [
{ "type": "pkgConfig", "args": "glesv2", "condition": "!config.darwin" },
{ "type": "makeSpec", "spec": "OPENGL_ES2" }