diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-08-04 10:22:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-08-05 06:34:33 +0200 |
| commit | 61269c26f648d0fea5f0b8403019c629931491c5 (patch) | |
| tree | 1b0b97f019ccb8a39353c17975473378fff81391 /tests | |
| parent | 72037c804dc9575b30ca9864634cdc905e5de84f (diff) | |
Fix cmake-test for Dynamic OpenGL.
Change-Id: I604501d07b4728c5158e88a6760b9f1e31311991
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/test_opengl_lib/main.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/tests/auto/cmake/test_opengl_lib/main.cpp b/tests/auto/cmake/test_opengl_lib/main.cpp index 1e874ed4fc..db3e8a261b 100644 --- a/tests/auto/cmake/test_opengl_lib/main.cpp +++ b/tests/auto/cmake/test_opengl_lib/main.cpp @@ -40,24 +40,31 @@ ****************************************************************************/ -#if GL_IMPLEMENTATION_GLES2 -#include <GLES2/gl2.h> -#elif GL_IMPLEMENTATION_GL - #include <qglobal.h> -#ifdef Q_OS_WIN -#include <qt_windows.h> -#endif - -#ifdef Q_OS_MAC -#include <OpenGL/gl.h> +#ifndef QT_OPENGL_DYNAMIC +# if defined(GL_IMPLEMENTATION_GLES2) +# include <GLES2/gl2.h> +# elif defined(GL_IMPLEMENTATION_GL) +# ifdef Q_OS_WIN +# include <qt_windows.h> +# endif +# ifdef Q_OS_MAC +# include <OpenGL/gl.h> +# else +# include <GL/gl.h> +# endif +# endif #else -#include <GL/gl.h> -#endif +# include <QOpenGLFunctions> #endif int main(int argc, char **argv) { +#ifndef QT_OPENGL_DYNAMIC glGetError(); +#else + QOpenGLFunctions functions; + functions.glGetError(); +#endif return 0; } |