diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-11 16:23:02 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-16 16:02:51 +0200 |
commit | 915f4d8c958c4aa9a773b3b5a3f58e34a1f37fc7 (patch) | |
tree | 87c84b8fa935c9e27c1e5c89bd89222bc86d392a /src/gui | |
parent | ba1aba61cc32772adb253b3e389d8762f147449f (diff) |
API-cleanup: Add QPlatformFontDatabase::registerAliasToFontFamily().
Unexport free function qt_registerAliasToFontFamily() and
Make it a static member of QPlatformFontDatabase instead.
Change-Id: I1df49a8e37a24b3961f92288d67b6f1108a7d520
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qfontdatabase_qpa.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 13 | ||||
-rw-r--r-- | src/gui/text/qplatformfontdatabase.h | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index 62b99968bc..8e6ad7cd97 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/src/gui/text/qfontdatabase_qpa.cpp @@ -85,7 +85,7 @@ Q_GUI_EXPORT void qt_registerFont(const QString &familyName, const QString &sty size->handle = handle; } -Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias) +void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias) { if (alias.isEmpty()) return; diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 4399aff9da..293535a2e1 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -53,6 +53,8 @@ extern void qt_registerFont(const QString &familyname, const QString &stylename, bool scalable, int pixelSize, bool fixedPitch, const QSupportedWritingSystems &writingSystems, void *hanlde); +void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias); + /*! \fn void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *handle) @@ -517,6 +519,17 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q } /*! + Helper function that register the \a alias for the \a familyName. + + \since 5.2 +*/ + +void QPlatformFontDatabase::registerAliasToFontFamily(const QString &familyName, const QString &alias) +{ + qt_registerAliasToFontFamily(familyName, alias); +} + +/*! \class QPlatformFontDatabase \since 5.0 \internal diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index 6e53eba98b..6053f11051 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -122,6 +122,8 @@ public: QFont::Style style, QFont::Stretch stretch, bool antialiased, bool scalable, int pixelSize, bool fixedPitch, const QSupportedWritingSystems &writingSystems, void *handle); + + static void registerAliasToFontFamily(const QString &familyName, const QString &alias); }; QT_END_NAMESPACE |