From 8a091a848b57608a0d7cd4dd9d97f0b21b269905 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 21 Nov 2012 16:19:21 +0100 Subject: Cocoa: Make sure child windows' QNSView is properly released Child QCocoaWindows don't have an assigned NSWindow, but still get a QNSView as backing store. That QNSView is added as a subview to the parent window's QNSView. That would leave an unmanaged QNSView alive. Change-Id: I10f57fb971f7aa1e278bb0af4217052d1e4bb0bc Reviewed-by: Richard Moe Gustavsen --- src/plugins/platforms/cocoa/qcocoawindow.mm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index e011d1c86f..84b468fccd 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -214,6 +214,8 @@ QCocoaWindow::~QCocoaWindow() QCocoaAutoReleasePool pool; clearNSWindow(m_nsWindow); + if (parent()) + [m_contentView removeFromSuperview]; [m_contentView release]; [m_nsWindow release]; [m_nsWindowDelegate release]; -- cgit v1.2.3