diff options
author | Zeno Albisser <zeno@webkit.org> | 2012-11-27 10:40:45 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-01 08:34:19 +0100 |
commit | f1cc2aaea9440af57ce6c0df5179ef4f5e184675 (patch) | |
tree | 477f15c5ecf80f2253b01f0a865ba2c9d7f4676f /src | |
parent | 5e61bbe586519c3d9bc636153d32e810da4e59a3 (diff) | |
download | qtbase-f1cc2aaea9440af57ce6c0df5179ef4f5e184675.tar.gz |
Properly release pixel format and context in QCocoaGLContext.
Change-Id: Idd13924dccc8d7798f463484eeb3c3074f7b51f1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.h | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.mm | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h index da134192f2..21c290c5be 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.h +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h @@ -56,6 +56,7 @@ class QCocoaGLContext : public QPlatformOpenGLContext { public: QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share); + ~QCocoaGLContext(); QSurfaceFormat format() const; diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index 99956a0b60..6671245926 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -65,11 +65,18 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo [m_context initWithFormat:pixelFormat shareContext:nil]; } + [pixelFormat release]; + const GLint interval = 1; [m_context setValues:&interval forParameter:NSOpenGLCPSwapInterval]; } +QCocoaGLContext::~QCocoaGLContext() +{ + [m_context release]; +} + // Match up with createNSOpenGLPixelFormat! QSurfaceFormat QCocoaGLContext::format() const { |