summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-17 13:22:03 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-17 13:22:03 (GMT)
commitfaf6d0de6e3b8168fbd6f04c5380f47d350e2a22 (patch)
treed3c35778ad9c7abe68b681b39dd004027fd50880 /src/opengl
parent3a92f40e1faf4d81f5071a66558b051a9fda727e (diff)
parent499a9aaabad0756cbca7b39751684308a6ba88ea (diff)
downloadQt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.zip
Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.gz
Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.bz2
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl_mac.mm1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm
index 063082b..4dd822d 100644
--- a/src/opengl/qgl_mac.mm
+++ b/src/opengl/qgl_mac.mm
@@ -460,6 +460,7 @@ void QGLContext::reset()
if (d->cx)
aglDestroyContext((AGLContext)d->cx);
#else
+ QMacCocoaAutoReleasePool pool;
[static_cast<NSOpenGLContext *>(d->cx) release];
#endif
d->cx = 0;