summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl/qgl.h')
-rw-r--r--src/opengl/qgl.h25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index caa5b96cdc..031bdf3317 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -59,25 +59,26 @@ QT_BEGIN_HEADER
#endif
#if defined(Q_OS_MAC)
+# if !defined(QT_NO_CORESERVICES)
# include <OpenGL/gl.h>
+# else
+# if defined(QT_OPENGL_ES_2)
+# include <OpenGLES/ES2/gl.h>
+# endif
+# endif
#elif defined(QT_OPENGL_ES_2)
-# if defined(Q_OS_MAC)
-# include <OpenGLES/ES2/gl.h>
+# include <GLES2/gl2.h>
# else
-# include <GLES2/gl2.h>
+# 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
-#else
-# if defined(Q_OS_MAC)
-# include <OpenGL/gl.h>
-# else
-# include <GL/gl.h>
-# endif
#endif
QT_BEGIN_NAMESPACE
@@ -277,7 +278,6 @@ public:
QGLFormat requestedFormat() const;
void setFormat(const QGLFormat& format);
- // ### Qt 5: return bools + maybe remove virtuals
virtual void makeCurrent();
virtual void doneCurrent();
@@ -340,7 +340,7 @@ protected:
void setWindowCreated(bool on);
bool initialized() const;
void setInitialized(bool on);
- void generateFontDisplayLists(const QFont & fnt, int listBase); // ### Qt 5: remove
+ void generateFontDisplayLists(const QFont & fnt, int listBase);
uint colorIndex(const QColor& c) const;
void setValid(bool valid);
@@ -402,7 +402,6 @@ public:
bool isValid() const;
bool isSharing() const;
- // ### Qt 5: return bools
void makeCurrent();
void doneCurrent();
@@ -474,7 +473,7 @@ protected:
virtual void glInit();
virtual void glDraw();
- int fontDisplayListBase(const QFont & fnt, int listBase = 2000); // ### Qt 5: remove
+ int fontDisplayListBase(const QFont & fnt, int listBase = 2000);
QGLWidget(QGLWidgetPrivate &dd,
const QGLFormat &format = QGLFormat(),