diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2011-09-29 17:54:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 16:54:45 +0200 |
| commit | d43775b93b7f0b2968c94a345e1c45bed5e63dbc (patch) | |
| tree | d5ab07d9c30f603faabc26b9abaf4fb6c6d58b3d /src/plugins | |
| parent | 577d51ee22afaf564054d55f6c74a4359a993523 (diff) | |
[directfb] Manage the font database with a QScopedPointer
Attempt to fix a memory leak on exit by deleting the font database.
Change-Id: I07b0865c97bb8ef26950bf231b5239ca01e95c56
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbintegration.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index e2fadb41fa..64533da586 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -142,7 +142,7 @@ QPlatformBackingStore *QDirectFbIntegration::createPlatformBackingStore(QWindow QPlatformFontDatabase *QDirectFbIntegration::fontDatabase() const { - return m_fontDb; + return m_fontDb.data(); } QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h index fc861599a6..837b162398 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.h +++ b/src/plugins/platforms/directfb/qdirectfbintegration.h @@ -94,7 +94,7 @@ private: QScopedPointer<QDirectFbScreen> m_primaryScreen; QScopedPointer<QDirectFbInput> m_input; QScopedPointer<QThread> m_inputRunner; - QPlatformFontDatabase *m_fontDb; + QScopedPointer<QPlatformFontDatabase> m_fontDb; QAbstractEventDispatcher *m_eventDispatcher; }; |