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

Fix cmake-test for Dynamic OpenGL.

Browse Source 
Change-Id: I604501d07b4728c5158e88a6760b9f1e31311991
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Friedemann Kleint 2014-08-04 10:22:00 +02:00
parent 72037c804d
commit 61269c26f6
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/auto/cmake/test_opengl_lib/main.cpp
View File

@ -40,24 +40,31 @@
****************************************************************************/ ****************************************************************************/
#if GL_IMPLEMENTATION_GLES2
#include <GLES2/gl2.h>
#elif GL_IMPLEMENTATION_GL
#include <qglobal.h> #include <qglobal.h>
#ifdef Q_OS_WIN #ifndef QT_OPENGL_DYNAMIC
#include <qt_windows.h> # if defined(GL_IMPLEMENTATION_GLES2)
#endif # include <GLES2/gl2.h>
# elif defined(GL_IMPLEMENTATION_GL)
#ifdef Q_OS_MAC # ifdef Q_OS_WIN
#include <OpenGL/gl.h> # include <qt_windows.h>
# endif
# ifdef Q_OS_MAC
# include <OpenGL/gl.h>
# else
# include <GL/gl.h>
# endif
# endif
#else #else
#include <GL/gl.h> # include <QOpenGLFunctions>
#endif
#endif #endif
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#ifndef QT_OPENGL_DYNAMIC
glGetError(); glGetError();
#else
QOpenGLFunctions functions;
functions.glGetError();
#endif
return 0; return 0;
} }