diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-12 17:33:26 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-12 17:33:26 (GMT) |
| commit | 145f445b6c7fa5546540c07f3bda493f4f825caf (patch) | |
| tree | 562fe324044cdc85b65b776ec84e45b0b44f4fa0 /src/opengl/qglpixelbuffer_mac.mm | |
| parent | b467246eb63ec649ad2348ac9b6886ee20dfc033 (diff) | |
| parent | 0cd84ffef786310c12cf7bd314a8922ac1aca1c0 (diff) | |
| download | Qt-145f445b6c7fa5546540c07f3bda493f4f825caf.zip Qt-145f445b6c7fa5546540c07f3bda493f4f825caf.tar.gz Qt-145f445b6c7fa5546540c07f3bda493f4f825caf.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations
Diffstat (limited to 'src/opengl/qglpixelbuffer_mac.mm')
| -rw-r--r-- | src/opengl/qglpixelbuffer_mac.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/opengl/qglpixelbuffer_mac.mm b/src/opengl/qglpixelbuffer_mac.mm index 9a679b1..e95e36b 100644 --- a/src/opengl/qglpixelbuffer_mac.mm +++ b/src/opengl/qglpixelbuffer_mac.mm @@ -299,9 +299,8 @@ void QGLPixelBuffer::releaseFromDynamicTexture() GLuint QGLPixelBuffer::generateDynamicTexture() const { - Q_D(const QGLPixelBuffer); - #ifdef QT_MAC_USE_COCOA + Q_D(const QGLPixelBuffer); NSOpenGLContext *oldContext = [NSOpenGLContext currentContext]; if (d->share_ctx != oldContext) [static_cast<NSOpenGLContext *>(d->share_ctx) makeCurrentContext]; |