From d43775b93b7f0b2968c94a345e1c45bed5e63dbc Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 29 Sep 2011 17:54:28 +0200
Subject: [directfb] Manage the font database with a QScopedPointer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforms/directfb/qdirectfbintegration.cpp | 2 +-
 src/plugins/platforms/directfb/qdirectfbintegration.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins')

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;
 };
 
-- 
cgit v1.2.3