diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-08-05 15:49:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-05 16:19:06 +0200 |
| commit | 6729dfbe0ed52d1fd5e1722d28c584cdcdd64545 (patch) | |
| tree | dd8b4a79cbaf295d514d9b99628cd0f701819ed2 /src/plugins/platforms | |
| parent | 687c33ea79dbd22cb187827a675af504347f7132 (diff) | |
Fix fallbacksForFamily in QBasicUnixFontDatabase
So that this function instead of the one in QPlatformFontDatabase
will be called.
Change-Id: Ifdb75ada27723c688e42067c7633b08391d66467
Reviewed-on: http://codereview.qt.nokia.com/2696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp index 6b844f9df1..d91cce59a9 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp +++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp @@ -237,7 +237,7 @@ QFontEngine *QBasicUnixFontDatabase::fontEngine(const QFontDef &fontDef, QUnicod return engine; } -QStringList QBasicUnixFontDatabase::fallbacksForFamily(const QString family, const QFont::Style &style, const QUnicodeTables::Script &script) const +QStringList QBasicUnixFontDatabase::fallbacksForFamily(const QString family, const QFont::Style &style, const QFont::StyleHint &styleHint, const QUnicodeTables::Script &script) const { Q_UNUSED(family); Q_UNUSED(style); diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h index f7fc0e547b..0e17ed55b6 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h +++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h @@ -57,7 +57,7 @@ class QBasicUnixFontDatabase : public QPlatformFontDatabase public: void populateFontDatabase(); QFontEngine *fontEngine(const QFontDef &fontDef, QUnicodeTables::Script script, void *handle); - QStringList fallbacksForFamily(const QString family, const QFont::Style &style, const QUnicodeTables::Script &script) const; + QStringList fallbacksForFamily(const QString family, const QFont::Style &style, const QFont::StyleHint &styleHint, const QUnicodeTables::Script &script) const; QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); void releaseHandle(void *handle); |