1 files changed, 0 insertions, 91 deletions

diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index e08e2d234f..3446e29029 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -58,18 +58,6 @@ QT_BEGIN_HEADER
 
 #if defined(Q_OS_MAC)
 # include <OpenGL/gl.h>
-#elif defined(QT_OPENGL_ES_1)
-# if defined(Q_OS_MAC)
-#  include <OpenGLES/ES1/gl.h>
-# else
-#  include <GLES/gl.h>
-# endif
-# ifndef GL_DOUBLE
-#  define GL_DOUBLE GL_FLOAT
-# endif
-# ifndef GLdouble
-typedef GLfloat GLdouble;
-# endif
 #elif defined(QT_OPENGL_ES_2)
 # if defined(Q_OS_MAC)
 #  include <OpenGLES/ES2/gl.h>
@@ -94,31 +82,6 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(OpenGL)
 
-#if defined(Q_WS_MAC) && defined (QT_BUILD_OPENGL_LIB) && !defined(QT_MAC_USE_COCOA) && !defined(QDOC)
-#define Q_MAC_COMPAT_GL_FUNCTIONS
-
-template <typename T>
-struct QMacGLCompatTypes
-{
-    typedef long CompatGLint;
-    typedef unsigned long CompatGLuint;
-    typedef unsigned long CompatGLenum;
-};
-
-template <>
-struct QMacGLCompatTypes<long>
-{
-    typedef int CompatGLint;
-    typedef unsigned int CompatGLuint;
-    typedef unsigned int CompatGLenum;
-};
-
-typedef QMacGLCompatTypes<GLint>::CompatGLint QMacCompatGLint;
-typedef QMacGLCompatTypes<GLint>::CompatGLuint QMacCompatGLuint;
-typedef QMacGLCompatTypes<GLint>::CompatGLenum QMacCompatGLenum;
-
-#endif
-
 #ifdef QT3_SUPPORT
 #define QGL_VERSION        460
 #define QGL_VERSION_STR        "4.6"
@@ -132,9 +95,6 @@ class QGLCmap;
 #endif
 
 class QPixmap;
-#if defined(Q_WS_X11) && !defined(QT_OPENGL_ES)
-class QGLOverlayWidget;
-#endif
 class QGLWidgetPrivate;
 class QGLContextPrivate;
 
@@ -371,22 +331,6 @@ public:
     void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
     void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
 
-#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
-    GLuint bindTexture(const QImage &image, QMacCompatGLenum = GL_TEXTURE_2D,
-                       QMacCompatGLint format = GL_RGBA);
-    GLuint bindTexture(const QPixmap &pixmap, QMacCompatGLenum = GL_TEXTURE_2D,
-                       QMacCompatGLint format = GL_RGBA);
-    GLuint bindTexture(const QImage &image, QMacCompatGLenum, QMacCompatGLint format,
-                       BindOptions);
-    GLuint bindTexture(const QPixmap &pixmap, QMacCompatGLenum, QMacCompatGLint format,
-                       BindOptions);
-
-    void deleteTexture(QMacCompatGLuint tx_id);
-
-    void drawTexture(const QRectF &target, QMacCompatGLuint textureId, QMacCompatGLenum textureTarget = GL_TEXTURE_2D);
-    void drawTexture(const QPointF &point, QMacCompatGLuint textureId, QMacCompatGLenum textureTarget = GL_TEXTURE_2D);
-#endif
-
     static void setTextureCacheLimit(int size);
     static int textureCacheLimit();
 
@@ -396,25 +340,12 @@ public:
 
     static const QGLContext* currentContext();
 
-#ifdef Q_WS_QPA
     static QGLContext *fromGuiGLContext(QGuiGLContext *platformContext);
     QGuiGLContext *contextHandle() const;
-#endif
 
 protected:
     virtual bool chooseContext(const QGLContext* shareContext = 0);
 
-#if defined(Q_WS_WIN)
-    virtual int choosePixelFormat(void* pfd, HDC pdc);
-#endif
-#if defined(Q_WS_X11) && defined(QT_NO_EGL)
-    virtual void* tryVisual(const QGLFormat& f, int bufDepth = 1);
-    virtual void* chooseVisual();
-#endif
-#if defined(Q_WS_MAC)
-    virtual void* chooseMacVisual(GDHandle);
-#endif
-
     bool deviceIsPixmap() const;
     bool windowCreated() const;
     void setWindowCreated(bool on);
@@ -430,9 +361,7 @@ protected:
     static QGLContext* currentCtx;
 
 private:
-#ifdef Q_WS_QPA
     QGLContext(QGuiGLContext *windowContext);
-#endif
 
     QScopedPointer<QGLContextPrivate> d_ptr;
 
@@ -441,12 +370,9 @@ private:
     friend class QGLWidget;
     friend class QGLWidgetPrivate;
     friend class QGLGlyphCache;
-    friend class QOpenGLPaintEngine;
-    friend class QOpenGLPaintEnginePrivate;
     friend class QGL2PaintEngineEx;
     friend class QGL2PaintEngineExPrivate;
     friend class QGLEngineShaderManager;
-    friend class QGLPixmapFilterBase;
     friend class QGLTextureGlyphCache;
     friend struct QGLGlyphTexture;
     friend class QGLContextGroup;
@@ -553,22 +479,6 @@ public:
     void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
     void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
 
-#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
-    GLuint bindTexture(const QImage &image, QMacCompatGLenum = GL_TEXTURE_2D,
-                       QMacCompatGLint format = GL_RGBA);
-    GLuint bindTexture(const QPixmap &pixmap, QMacCompatGLenum = GL_TEXTURE_2D,
-                       QMacCompatGLint format = GL_RGBA);
-    GLuint bindTexture(const QImage &image, QMacCompatGLenum, QMacCompatGLint format,
-                       QGLContext::BindOptions);
-    GLuint bindTexture(const QPixmap &pixmap, QMacCompatGLenum, QMacCompatGLint format,
-                       QGLContext::BindOptions);
-
-    void deleteTexture(QMacCompatGLuint tx_id);
-
-    void drawTexture(const QRectF &target, QMacCompatGLuint textureId, QMacCompatGLenum textureTarget = GL_TEXTURE_2D);
-    void drawTexture(const QPointF &point, QMacCompatGLuint textureId, QMacCompatGLenum textureTarget = GL_TEXTURE_2D);
-#endif
-
 public Q_SLOTS:
     virtual void updateGL();
     virtual void updateOverlayGL();
@@ -610,7 +520,6 @@ private:
     friend class QGLContext;
     friend class QGLContextPrivate;
     friend class QGLOverlayWidget;
-    friend class QOpenGLPaintEngine;
     friend class QGLPaintDevice;
     friend class QGLWidgetGLPaintDevice;
 };