diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-08 08:47:27 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-08 08:47:27 (GMT) |
| commit | f17c21cec25f40991865343c5f9c3e838e13d5d3 (patch) | |
| tree | 616d8582e9817c96d98bf1a645aee76bd4b21598 /src/opengl/qglpixelbuffer_mac.mm | |
| parent | 0822e845b2678ab626cd5fe9919364188c06a70e (diff) | |
| parent | 04975e4a594af999600e175f65869f615f5e9740 (diff) | |
| download | Qt-f17c21cec25f40991865343c5f9c3e838e13d5d3.zip Qt-f17c21cec25f40991865343c5f9c3e838e13d5d3.tar.gz Qt-f17c21cec25f40991865343c5f9c3e838e13d5d3.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
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]; |