From 61269c26f648d0fea5f0b8403019c629931491c5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 4 Aug 2014 10:22:00 +0200
Subject: Fix cmake-test for Dynamic OpenGL.

Change-Id: I604501d07b4728c5158e88a6760b9f1e31311991
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 tests/auto/cmake/test_opengl_lib/main.cpp | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'tests')

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;
 }
-- 
cgit v1.2.3