diff options
| author | Qt4iOS <ian@mediator-software.com> | 2012-03-24 14:18:43 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 08:33:56 +0200 |
| commit | affbbcd7382b645ae4c44e2813afd7275da10a20 (patch) | |
| tree | e777541289a671e4386e79352fc70d26a97dde72 /src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | |
| parent | dcd893fbf7fbbc28df13ff26888bf983e86c0dbd (diff) | |
Added iOS compatibility.
Put MacOS-specific code in #ifdef blocks so that it is not compiled for
iOS. Add iOS implementation for MacOS-specific code, where possible.
Change-Id: I3664c76fcfa8d5497ad1db676b9331e4ae0dca0e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index 556b176b07..cbe1b28db8 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -55,7 +55,9 @@ public: QFontEngine *fontEngine(const QFontDef &fontDef, QUnicodeTables::Script script, void *handle); QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference); QStringList fallbacksForFamily(const QString family, const QFont::Style &style, const QFont::StyleHint &styleHint, const QUnicodeTables::Script &script) const; +#ifndef QT_NO_CORESERVICES QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); +#endif void releaseHandle(void *handle); QFont defaultFont() const; QList<int> standardSizes() const; |