diff options
author | Martin Smith <martin.smith@qt.io> | 2017-01-02 11:43:45 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2017-01-05 07:35:32 +0000 |
commit | 3b37208e33cbff5ae40bc0f2c1fe65f77d405469 (patch) | |
tree | ce6a3f4b27b30bfd4db5a2a9eb458142194fe240 /src/gui/text | |
parent | d78cddc71935056e01e63466d220623468c2260c (diff) |
doc: Moved two qdoc comments
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>
Diffstat (limited to 'src/gui/text')
-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) |