diff options
| author | James Turner <james.turner@kdab.com> | 2013-12-16 13:08:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-06 13:04:03 +0100 |
| commit | bf32528f4b08b31bf25af6e2e4cb9b8edb7654cd (patch) | |
| tree | 8ad72efc9f56bced95aa6e81ce7d64a836737341 | |
| parent | bd5cea5ba8458ab3d34700999654dbd7d7174084 (diff) | |
Add support for OpenType (.otf) fonts
FreeType already has support for the file format, so simply
ensure they are picked up by the generic database. (Other backends,
such as Windows, already had support)
[ChangeLog][QtGui] Qt's generic font database now adds OpenType fonts (.otf).
Change-Id: Ief5a3329e66b8066aad284172afd004f2cdfaebb
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index be0164d8eb..33f3601b97 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -103,7 +103,8 @@ void QBasicFontDatabase::populateFontDatabase() QDir dir(fontpath); dir.setNameFilters(QStringList() << QLatin1String("*.ttf") << QLatin1String("*.ttc") << QLatin1String("*.pfa") - << QLatin1String("*.pfb")); + << QLatin1String("*.pfb") + << QLatin1String("*.otf")); dir.refresh(); for (int i = 0; i < int(dir.count()); ++i) { const QByteArray file = QFile::encodeName(dir.absoluteFilePath(dir[i])); |