diff options
| author | Kevin Wright <kevin.wright@nokia.com> | 2010-07-27 08:29:37 (GMT) |
|---|---|---|
| committer | Kevin Wright <kevin.wright@nokia.com> | 2010-07-27 08:29:37 (GMT) |
| commit | 2b76b4fb7f91cc266a160420d12f0581cd87539a (patch) | |
| tree | c5c9b754f29c63295ab2c55ff8e1b837e02b2f8f /src/opengl/qglbuffer.cpp | |
| parent | a98af1c7f1bba3c791d08e76e4896e48ea6ea019 (diff) | |
| parent | 7b16419e61ea0ec2aa981b9600581f517addbb72 (diff) | |
| download | Qt-2b76b4fb7f91cc266a160420d12f0581cd87539a.zip Qt-2b76b4fb7f91cc266a160420d12f0581cd87539a.tar.gz Qt-2b76b4fb7f91cc266a160420d12f0581cd87539a.tar.bz2 | |
Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/opengl/qglbuffer.cpp')
| -rw-r--r-- | src/opengl/qglbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglbuffer.cpp b/src/opengl/qglbuffer.cpp index d6e0109..5f0aed4 100644 --- a/src/opengl/qglbuffer.cpp +++ b/src/opengl/qglbuffer.cpp @@ -416,7 +416,7 @@ void QGLBuffer::allocate(const void *data, int count) \sa release(), create() */ -bool QGLBuffer::bind() const +bool QGLBuffer::bind() { #ifndef QT_NO_DEBUG if (!isCreated()) @@ -448,7 +448,7 @@ bool QGLBuffer::bind() const \sa bind() */ -void QGLBuffer::release() const +void QGLBuffer::release() { #ifndef QT_NO_DEBUG if (!isCreated()) |