diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 01:20:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 01:20:14 (GMT) |
| commit | da6e8e44ea17da669a173c5cca38ccc77e53dd51 (patch) | |
| tree | c3d248c3d0beada8319b1091ef0938e4dc4f2b26 /src/opengl/qglshaderprogram.h | |
| parent | d5d5cd63e68ce63eb7a131df4dc8cfa274f93fc2 (diff) | |
| parent | ad47f9cee2cd47ef566f86ca20f54e3f6da54070 (diff) | |
| download | Qt-da6e8e44ea17da669a173c5cca38ccc77e53dd51.zip Qt-da6e8e44ea17da669a173c5cca38ccc77e53dd51.tar.gz Qt-da6e8e44ea17da669a173c5cca38ccc77e53dd51.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Remove obsolete OpenGL/ES CommonLite (fixed-point) support
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 24ab986..215750e 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_OPENGL_ES_1) +#if !defined(QT_OPENGL_ES_1) class QGLShaderProgram; class QGLShaderPrivate; |