1 files changed, 0 insertions, 26 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index 09b6184bcb..591aab27cd 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(OpenGL)
 
-#if !defined(QT_OPENGL_ES_1)
-
 class QGLShaderProgram;
 class QGLShaderPrivate;
 
@@ -204,17 +202,6 @@ public:
     void setAttributeBuffer
         (const char *name, GLenum type, int offset, int tupleSize, int stride = 0);
 
-#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
-    void setAttributeArray
-        (int location, QMacCompatGLenum type, const void *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (const char *name, QMacCompatGLenum type, const void *values, int tupleSize, int stride = 0);
-    void setAttributeBuffer
-        (int location, QMacCompatGLenum type, int offset, int tupleSize, int stride = 0);
-    void setAttributeBuffer
-        (const char *name, QMacCompatGLenum type, int offset, int tupleSize, int stride = 0);
-#endif
-
     void enableAttributeArray(int location);
     void enableAttributeArray(const char *name);
     void disableAttributeArray(int location);
@@ -224,17 +211,6 @@ public:
     int uniformLocation(const QByteArray& name) const;
     int uniformLocation(const QString& name) const;
 
-#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
-    void setUniformValue(int location, QMacCompatGLint value);
-    void setUniformValue(int location, QMacCompatGLuint value);
-    void setUniformValue(const char *name, QMacCompatGLint value);
-    void setUniformValue(const char *name, QMacCompatGLuint value);
-    void setUniformValueArray(int location, const QMacCompatGLint *values, int count);
-    void setUniformValueArray(int location, const QMacCompatGLuint *values, int count);
-    void setUniformValueArray(const char *name, const QMacCompatGLint *values, int count);
-    void setUniformValueArray(const char *name, const QMacCompatGLuint *values, int count);
-#endif
-
     void setUniformValue(int location, GLfloat value);
     void setUniformValue(int location, GLint value);
     void setUniformValue(int location, GLuint value);
@@ -335,8 +311,6 @@ private:
     bool init();
 };
 
-#endif
-
 QT_END_NAMESPACE
 
 QT_END_HEADER