AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove out-dated duplicate logic from qgl.h

Browse Source 
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>
This commit is contained in:
Sean Harmer 2013-01-14 15:33:24 +00:00 committed by The Qt Project
parent dca90252a7
commit ff9aa64c99
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/opengl/qgl.h
View File

@ -44,6 +44,7 @@
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
#include <QtGui/qopengl.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
#include <QtGui/qpaintengine.h> #include <QtGui/qpaintengine.h>
#include <QtOpenGL/qglcolormap.h> #include <QtOpenGL/qglcolormap.h>
@ -54,33 +55,6 @@
QT_BEGIN_HEADER 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 QT_BEGIN_NAMESPACE