From a544ef59060a6c430cbb92fceb0d1b0e22492f3f Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Thu, 4 Sep 2014 13:29:15 +0200
Subject: QCoreTextFontDatabase: reduce memory consumption
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ATSFontNotify() allocates over 30MB for no apparent reason for
applications that don't register fonts.

Change-Id: I7bbc97f53b76be1e638de8ca0d1be3a08586cf00
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index ca7afb7d1b..063d20dbd4 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -768,6 +768,9 @@ QList<int> QCoreTextFontDatabase::standardSizes() const
 
 void QCoreTextFontDatabase::removeApplicationFonts()
 {
+    if (m_applicationFonts.isEmpty())
+        return;
+
     foreach (const QVariant &font, m_applicationFonts) {
 #if HAVE_CORETEXT
         if (&CTFontManagerUnregisterGraphicsFont && &CTFontManagerUnregisterFontsForURL) {
-- 
cgit v1.2.3