From ff9aa64c99bf04f7e45ee80c6c9fb4e0e69e9511 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Mon, 14 Jan 2013 15:33:24 +0000
Subject: Remove out-dated duplicate logic from qgl.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now use the updated logic for #including the correct GL headers
already implemented in QtGui.

This is needed to fix compilation of QtOpenGL on CentOS 5.8 and
RHEL.

Change-Id: Ifdedd13885566016073538f33aa6daf5902c3497
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 src/opengl/qgl.h | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'src/opengl/qgl.h')

diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 1d21b42cd5..e2d8bbba16 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -44,6 +44,7 @@
 
 #ifndef QT_NO_OPENGL
 
+#include <QtGui/qopengl.h>
 #include <QtWidgets/qwidget.h>
 #include <QtGui/qpaintengine.h>
 #include <QtOpenGL/qglcolormap.h>
@@ -54,33 +55,6 @@
 
 QT_BEGIN_HEADER
 
-#if defined(Q_OS_WIN)
-# include <QtCore/qt_windows.h>
-#endif
-
-#if defined(Q_OS_MAC)
-# if !defined(Q_OS_IOS)
-# include <OpenGL/gl.h>
-# else
-#  if defined(QT_OPENGL_ES_2)
-#   include <OpenGLES/ES2/gl.h>
-#  endif
-# endif
-#elif defined(QT_OPENGL_ES_2)
-# include <GLES2/gl2.h>
-# else
-# include <GL/gl.h>
-# endif
-
-#if defined(QT_OPENGL_ES_2)
-# ifndef GL_DOUBLE
-#  define GL_DOUBLE GL_FLOAT
-# endif
-# ifndef GLdouble
-typedef GLfloat GLdouble;
-# endif
-#endif
-
 QT_BEGIN_NAMESPACE
 
 
-- 
cgit v1.2.3