diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-01-13 13:46:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-14 05:36:12 +0100 |
| commit | e97d77d5bc72c92f007b51d84f3fab7d16e62d21 (patch) | |
| tree | 2df30b5d99c4ebc8bc37cb77e8f75551e58cdd45 /src/plugins/platforms/cocoa/qcocoaintegration.h | |
| parent | e58e1abbd9f4993782e87051f3c96a44a1e208aa (diff) | |
Clean up QCocoaIntegration destruction.
Fix memory leak - delete the font database. Remove
the NAApplication delegate.
Change-Id: I7c69eb4df01c8450c0abde360f77fbb318b20c83
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index dd0c4aedfe..46e8925ba7 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -47,6 +47,7 @@ #include "qcocoaautoreleasepool.h" #include "qcocoacursor.h" +#include <QtCore/QScopedPointer> #include <QtGui/QPlatformIntegration> QT_BEGIN_NAMESPACE @@ -90,11 +91,12 @@ public: QPlatformTheme *platformTheme() const; private: - QPlatformFontDatabase *mFontDb; + + QScopedPointer<QPlatformFontDatabase> mFontDb; QAbstractEventDispatcher *mEventDispatcher; - QPlatformAccessibility *mAccessibility; - QPlatformTheme *mPlatformTheme; + QScopedPointer<QPlatformAccessibility> mAccessibility; + QScopedPointer<QPlatformTheme> mPlatformTheme; }; QT_END_NAMESPACE |