diff options
| author | aavit <qt-info@nokia.com> | 2011-02-28 13:55:43 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-02-28 13:55:43 (GMT) |
| commit | c0ef39aaf2836ef5988e25a219f9bcbff2319ad2 (patch) | |
| tree | 4246544c8c267d2d131dc9d7f9f759419dd2dff4 /src/gui/text/qfontdatabase.h | |
| parent | eedc18d1fdcf7c359916304cbf0b4629bbf70c84 (diff) | |
| parent | 992f233cac66384685212e03dfa600664a23b924 (diff) | |
| download | Qt-c0ef39aaf2836ef5988e25a219f9bcbff2319ad2.zip Qt-c0ef39aaf2836ef5988e25a219f9bcbff2319ad2.tar.gz Qt-c0ef39aaf2836ef5988e25a219f9bcbff2319ad2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
Diffstat (limited to 'src/gui/text/qfontdatabase.h')
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 3e9483b..ae1130e 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -152,6 +152,7 @@ public: private: static void createDatabase(); static void parseFontName(const QString &name, QString &foundry, QString &family); + static QString resolveFontFamilyAlias(const QString &family); #if defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_OS_SYMBIAN) static QFontEngine *findFont(int script, const QFontPrivate *fp, const QFontDef &request); #endif |