From 6007e3d8ffd8e7c87f67f355ed2b23f98519848e Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 21 Apr 2009 09:46:59 +1000 Subject: Disable shaders on OpenGL/ES 1.1 Reviewed-by: trustme --- src/opengl/qglshaderprogram.cpp | 2 +- src/opengl/qglshaderprogram.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index ccccc154a9..2715ed2016 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_OPENGL_ES_1_CL) +#if !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) /*! \class QGLShaderProgram diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index d4780f736f..b69d28e341 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(OpenGL) -#if !defined(QT_OPENGL_ES_1_CL) && !defined(QT_GL_FIXED_PREFERRED) +#if !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) class QGLShaderProgram; class QGLShaderPrivate; -- cgit v1.2.1