diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-02-01 10:33:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-01 12:31:16 +0100 |
| commit | 256dc059eeea05878112e4cbb55d9a152d21fa1a (patch) | |
| tree | ac6b92ec5dd09f874d05f223ef9b274374d2bf1b /src/opengl | |
| parent | f9725ce9c2d16474ca47ab6ac25f5df748b12ab5 (diff) | |
| parent | 6239af6f0f15871e02a516c97c5f1775743d352b (diff) | |
Merge "Merge branch 'release' into stable" into refs/staging/stable
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.h | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index b5924822ef..2fc21cb501 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 |