diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-07-11 14:39:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-14 08:56:02 +0100 |
| commit | fa7661d8b25fa338649a301010e1b5a2b63da731 (patch) | |
| tree | abcc7217685ddb3175dcbf2589727448d72c9a28 /src/gui/text/qplatformfontdatabase.h | |
| parent | 3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa (diff) | |
Fix styleName support in QPA font database
Font styleName support was disconnected since Qt switched to QPA
fontdatabase. Now add the code from Qt 4.8 back to enable this in
QPA.
Change-Id: Iab2cbfd5468f87542183348c2123ca4b2c270692
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/gui/text/qplatformfontdatabase.h')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index 8c2e4cf5f7..5ff2542982 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -116,7 +116,8 @@ public: //callback static void registerQPF2Font(const QByteArray &dataArray, void *handle); - static void registerFont(const QString &familyname, const QString &foundryname, QFont::Weight weight, + static void registerFont(const QString &familyname, const QString &stylename, + const QString &foundryname, QFont::Weight weight, QFont::Style style, QFont::Stretch stretch, bool antialiased, bool scalable, int pixelSize, bool fixedPitch, const QSupportedWritingSystems &writingSystems, void *handle); |