diff options
Diffstat (limited to 'src/gui/text/qplatformfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index b83affecdc..ac3d274b36 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -423,14 +423,14 @@ QFont QPlatformFontDatabase::defaultFont() const return QFont(QLatin1String("Helvetica")); } + +QString qt_resolveFontFamilyAlias(const QString &alias); + /*! Resolve alias to actual font family names. \since 5.0 */ - -QString qt_resolveFontFamilyAlias(const QString &alias); - QString QPlatformFontDatabase::resolveFontFamilyAlias(const QString &family) const { return qt_resolveFontFamilyAlias(family); @@ -628,12 +628,13 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q } /*! - Helper function that returns the Qt font weight matching a given opentype integer value. + Helper function that returns the Qt font weight matching + a given opentype integer value. Converts the integer + \a weight (0 ~ 1000) to QFont::Weight and returns it. \since 5.5 */ -// convert 0 ~ 1000 integer to QFont::Weight QFont::Weight QPlatformFontDatabase::weightFromInteger(int weight) { if (weight < 150) |