diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-08 16:50:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-11 17:29:39 +0200 |
| commit | bf42eacc7fb283d123f9bdf9ebc19c16dd7035e4 (patch) | |
| tree | 64513d8fd13bb6e1beaa275706d10508bec12590 /src/gui/text/qplatformfontdatabase.cpp | |
| parent | 30f19d904fb3b93f4bb9a17646748b1fca4f286a (diff) | |
Windows font database: Resolve aliases for extra fonts.
Ensure QFontDataBase::hasFamily() deals with aliases.
Task-number: QTBUG-31689
Change-Id: Ia59bfcb93362ac9343c6d30dab1091a4db482dfa
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/text/qplatformfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 4e2a2df66a..4399aff9da 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -379,9 +379,11 @@ QFont QPlatformFontDatabase::defaultFont() const \since 5.0 */ +QString qt_resolveFontFamilyAlias(const QString &alias); + QString QPlatformFontDatabase::resolveFontFamilyAlias(const QString &family) const { - return family; + return qt_resolveFontFamilyAlias(family); } /*! |