diff options
| author | Takumi Asaki <asaki@sra.co.jp> | 2013-07-03 01:35:25 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-16 01:05:15 (GMT) |
| commit | bf8b674d95324f21551e6a221f6ec094e22da1a5 (patch) | |
| tree | 5a632693aa2b2266144858aeb914ad2bf7f13128 | |
| parent | 9cfac2e38cde24a2fbca4c1cebcf7a771443894a (diff) | |
| download | Qt-bf8b674d95324f21551e6a221f6ec094e22da1a5.zip Qt-bf8b674d95324f21551e6a221f6ec094e22da1a5.tar.gz Qt-bf8b674d95324f21551e6a221f6ec094e22da1a5.tar.bz2 | |
Add missing argument to QBasicUnixFontDatabase::fallbacksForFamily()
Change-Id: I403745b8c734092078011b56fa0373981d9ad119
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp index cabc4c6..1d7a0ac 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp +++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp @@ -237,10 +237,11 @@ 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); + Q_UNUSED(styleHint); Q_UNUSED(script); return QStringList(); } diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h index 9ac02f2..4eab216 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); |