summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
diff options
context:
space:
mode:
authorAndreas Hartmetz <andreas.hartmetz@kdab.com>2016-04-02 23:32:16 +0200
committerKonstantin Ritt <ritt.ks@gmail.com>2016-04-29 08:29:25 +0000
commitc0979fe9d637f49a9d81fa9a2278a6b812eecfed (patch)
tree91ec9bc38b8731cd5e9bf3cdf1654979232d10f6 /src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
parentccdc3eac807c6f2f6689401bb32fe7bde7fcbe4e (diff)
Minor fixups to the change that added FreeType on OSX
The opentype CONFIG does nothing, and the removed if condition has already been checked at that point. Change-Id: Ibf5365eb08f09451230319bc6af1014614876792 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm')
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index f5372151b7..df39dcf6be 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -638,7 +638,7 @@ static CFArrayRef createDescriptorArrayForFont(CTFontRef font, const QString &fi
// QUrl::fromLocalFile() doesn't accept qrc pseudo-paths like ":/fonts/myfont.ttf".
// Therefore construct from QString with the qrc:// scheme -> "qrc:///fonts/myfont.ttf".
fontURL = QUrl(QStringLiteral("qrc://") + fileName.mid(1)).toCFURL();
- } else if (!fileName.isEmpty()) {
+ } else {
// At this point we hope that filename is in a format that QUrl can handle.
fontURL = QUrl::fromLocalFile(fileName).toCFURL();
}