diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-02 12:56:40 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-02 12:57:32 (GMT) |
| commit | d4ea57ff9022305437fb371802b41120074d3467 (patch) | |
| tree | 473ed0147ccc678a6cbde8a8fe8793f734c66af0 /src/opengl/gl2paintengineex | |
| parent | 0e02c54e7e56ee091aeeb6342faa2df163fbbd74 (diff) | |
| download | Qt-d4ea57ff9022305437fb371802b41120074d3467.zip Qt-d4ea57ff9022305437fb371802b41120074d3467.tar.gz Qt-d4ea57ff9022305437fb371802b41120074d3467.tar.bz2 | |
Safeguard isNull() pixmaps in bindTexture and remove a compile warning
Reviewed-by: TrustMe
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 59e50d0..50c1432 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -254,7 +254,7 @@ static const GLuint QT_VERTEX_COORDS_ATTR = 0; static const GLuint QT_TEXTURE_COORDS_ATTR = 1; static const GLuint QT_OPACITY_ATTR = 2; -struct QGLEngineShaderProg; +class QGLEngineShaderProg; class QGLEngineSharedShaders : public QObject { |