diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 02:21:14 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 02:21:14 (GMT) |
commit | 382afea50beb03a820f6381d6f2c936ccc1afac4 (patch) | |
tree | 5c5c53ebaec0a9cda42388e5596d2aad58e7933e /src/opengl/qglframebufferobject.h | |
parent | 58c35181a67aaa3d02ad5055303ec48777e47b8c (diff) | |
parent | ea19e075c7eb34a6a7979fa3cfb2dcc838d33c11 (diff) | |
download | Qt-382afea50beb03a820f6381d6f2c936ccc1afac4.zip Qt-382afea50beb03a820f6381d6f2c936ccc1afac4.tar.gz Qt-382afea50beb03a820f6381d6f2c936ccc1afac4.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/opengl/qglframebufferobject.h')
-rw-r--r-- | src/opengl/qglframebufferobject.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index ec1ae7d..6c1c0be 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -93,7 +93,7 @@ public: virtual ~QGLFramebufferObject(); - const QGLFramebufferObjectFormat &format() const; + QGLFramebufferObjectFormat format() const; bool isValid() const; bool isBound() const; @@ -161,6 +161,8 @@ public: private: QGLFramebufferObjectFormatPrivate *d; + + void detach(); }; QT_END_NAMESPACE |