diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-20 23:46:59 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:17:57 (GMT) |
| commit | 6007e3d8ffd8e7c87f67f355ed2b23f98519848e (patch) | |
| tree | 1c8632175b4fd1d0487dfd48f75861879513ec7d /src/opengl | |
| parent | 2f60b9688cd48c0cbaaf06862273056ff3710863 (diff) | |
| download | Qt-6007e3d8ffd8e7c87f67f355ed2b23f98519848e.zip Qt-6007e3d8ffd8e7c87f67f355ed2b23f98519848e.tar.gz Qt-6007e3d8ffd8e7c87f67f355ed2b23f98519848e.tar.bz2 | |
Disable shaders on OpenGL/ES 1.1
Reviewed-by: trustme
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index ccccc15..2715ed2 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 d4780f7..b69d28e 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; |