AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: Moved two qdoc comments

Browse Source 
They were simply not postioned correctly relative
to the functions they were meant to document.

Change-Id: I6eef94b291ae4ffe343d2728cc32477f55b2a871
Reviewed-by: Martin Smith <martin.smith@qt.io>
This commit is contained in:
Martin Smith 2017-01-02 11:43:45 +01:00
parent d78cddc719
commit 3b37208e33
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/text/qplatformfontdatabase.cpp
View File

@ -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)