From 27894537abac388eac904a180a0107f8c007fcbc Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Mon, 24 Nov 2014 13:46:28 +0400
Subject: Make more font databases report fontsAlwaysScalable()

DirectWrite and CoreText supports scaling of non-scalable fonts.

Change-Id: I910c6a35e3d94c31efa9b26dd89bcb027951ac99
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
---
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm  | 5 +++++
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 1 +
 2 files changed, 6 insertions(+)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 9f2ff10a21..b5df38734d 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -842,6 +842,11 @@ QFont QCoreTextFontDatabase::defaultFont() const
     return QFont(defaultFontName);
 }
 
+bool QCoreTextFontDatabase::fontsAlwaysScalable() const
+{
+    return true;
+}
+
 QList<int> QCoreTextFontDatabase::standardSizes() const
 {
     QList<int> ret;
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index 044db2b03d..b95a145c1a 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -87,6 +87,7 @@ public:
     void releaseHandle(void *handle);
     bool isPrivateFontFamily(const QString &family) const;
     QFont defaultFont() const;
+    bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
     QList<int> standardSizes() const;
 
     // For iOS and OS X platform themes
-- 
cgit v1.2.3