diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:08:43 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:08:43 (GMT) |
| commit | 7a42405649aeea3e709231464d450b5da521e5cb (patch) | |
| tree | c8a0bc351478ee24a29e2a436fe498213598a5ae /src/opengl/qglframebufferobject.cpp | |
| parent | ba1491c5942239f9e0f3f283114f9ed91f43f02b (diff) | |
| parent | 08ae7ee1fb930e7d4b4039e2294cba69f9380964 (diff) | |
| download | Qt-7a42405649aeea3e709231464d450b5da521e5cb.zip Qt-7a42405649aeea3e709231464d450b5da521e5cb.tar.gz Qt-7a42405649aeea3e709231464d450b5da521e5cb.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/tools/qringbuffer_p.h
Diffstat (limited to 'src/opengl/qglframebufferobject.cpp')
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index c362b7e..6e908e2 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -448,7 +448,6 @@ QGLFramebufferObject::~QGLFramebufferObject() glDeleteRenderbuffersEXT(1, &d->depth_stencil_buffer); glDeleteFramebuffersEXT(1, &d->fbo); } - delete d_ptr; } /*! |