diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2011-12-08 10:54:49 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-08 12:46:08 +0100 |
| commit | 1a218a7ee1c031f16690941ef859885534b3483d (patch) | |
| tree | 9c9475be576903fef958d9d41eaa803d658605cf /src/plugins/platforms | |
| parent | e79b9d6a36bdebaf95a8ff9b2fad70d6c11d2b6a (diff) | |
Cocoa: remove autoreleasepool in QCocoaIntegration
This one was far to long lived and would delay
releases until application shutdown.
We might get more "no autoreleasepool in place"
warnings now, these should be fixed by adding local
auto release pools.
Change-Id: Ia7a46ab05fb1937154997d0c47b8899d2a0cef65
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 5311eaff83..1852173b5b 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -93,7 +93,6 @@ private: QPlatformFontDatabase *mFontDb; QAbstractEventDispatcher *mEventDispatcher; - QCocoaAutoReleasePool *mPool; QPlatformAccessibility *mAccessibility; QPlatformTheme *mPlatformTheme; }; diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 445f67f1e7..6d7770fecc 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -90,8 +90,6 @@ QCocoaIntegration::QCocoaIntegration() : mFontDb(new QCoreTextFontDatabase()) , mEventDispatcher(new QCocoaEventDispatcher()) { - mPool = new QCocoaAutoReleasePool; - qApp->setAttribute(Qt::AA_DontUseNativeMenuBar, false); NSApplication *cocoaApplication = [NSApplication sharedApplication]; @@ -141,7 +139,6 @@ QCocoaIntegration::QCocoaIntegration() QCocoaIntegration::~QCocoaIntegration() { delete mAccessibility; - delete mPool; } bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) const |