diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /src/opengl/qgl.h | |
parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/opengl/qgl.h')
-rw-r--r-- | src/opengl/qgl.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index fa9037abae..72fe7b8da6 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> @@ -52,32 +53,6 @@ #include <QtGui/QSurfaceFormat> -#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 |