From 903bd6250affd4209dff4e73c4c46cb69965f5fa Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 25 Sep 2012 10:57:21 +0200 Subject: [PATCH] Cocoa: add missing auto release pools Got complaints while running file dialog example. Adding in the release pools will fix the problem. Change-Id: Ib33fddd5aedfc3e4aaa6fdd8995bbc8c8098267c Reviewed-by: Gabriel de Dietrich --- src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index 872a5cb..48be019 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -60,6 +60,7 @@ #include #include #include +#include "qcocoaautoreleasepool.h" #include @@ -526,6 +527,7 @@ QCocoaFileDialogHelper::~QCocoaFileDialogHelper() { if (!mDelegate) return; + QCocoaAutoReleasePool pool; [reinterpret_cast(mDelegate) release]; mDelegate = 0; } @@ -641,6 +643,7 @@ void QCocoaFileDialogHelper::createNSOpenSavePanelDelegate() { if (mDelegate) return; + QCocoaAutoReleasePool pool; const SharedPointerFileDialogOptions &opts = options(); const QStringList selectedFiles = opts->initiallySelectedFiles(); const QString directory = opts->initialDirectory(); @@ -688,6 +691,7 @@ void QCocoaFileDialogHelper::exec() // QEventLoop has been interrupted, and the second-most event loop has not // yet been reactivated (regardless if [NSApp run] is still on the stack)), // showing a native modal dialog will fail. + QCocoaAutoReleasePool pool; QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast(mDelegate); if ([delegate runApplicationModalPanel]) emit accept(); -- 2.7.4