diff options
-rw-r--r-- | src/gui/text/qfontdatabase.cpp | 7 | ||||
-rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 13 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index afbf783c3a..46e5736b68 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -804,6 +804,13 @@ QString qt_resolveFontFamilyAlias(const QString &alias) return alias; } +/*! + Returns a list of alternative fonts for the specified \a family and + \a style and \a script using the \a styleHint given. + + Default implementation returns a list of fonts for which \a style and \a script support + has been reported during the font database population. +*/ QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const { Q_UNUSED(family); diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 4ad826e87b..d89805d18e 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -62,8 +62,6 @@ void qt_registerFontFamily(const QString &familyName); void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias); /*! - \fn void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *handle) - Registers the pre-rendered QPF2 font contained in the given \a dataArray. \sa registerFont() @@ -373,17 +371,6 @@ QFontEngine *QPlatformFontDatabase::fontEngine(const QByteArray &fontData, qreal } /*! - \fn QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const - - Returns a list of alternative fonts for the specified \a family and - \a style and \a script using the \a styleHint given. - - Default implementation returns a list of fonts for which \a style and \a script support - has been reported during the font database population. -*/ -// implemented in qfontdatabase.cpp - -/*! Adds an application font described by the font contained supplied \a fontData or using the font contained in the file referenced by \a fileName. Returns a list of family names, or an empty list if the font could not be added. |