diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-01-24 15:51:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-25 03:04:56 +0100 |
| commit | 690761a74d252e56a6cffb7e08015680ba3e2038 (patch) | |
| tree | 06a39ce73e792fcfee061243f9c5f477e0e364eb /src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | |
| parent | c76a6fe2c4f7e2e92ea0fe02b1e635c529db8a12 (diff) | |
Enable adding/removing application fonts on iOS
As CTFontManagerCreateFontDescriptorsFromURL is not available on iOS < 7.0
we unfortunately need to fall back to the old behavior of only adding a
single font on older iOS versions.
Task-number: QTBUG-34490
Change-Id: I9c37a5cada067a4ebfaa9f04e7a30d41b8945990
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index da0c1d338b..ce2eba41d0 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -42,6 +42,10 @@ #ifndef QCORETEXTFONTDATABASE_H #define QCORETEXTFONTDATABASE_H +#include <qglobal.h> +#define HAVE_CORETEXT QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_8, __IPHONE_4_1) +#define HAVE_ATS QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_5, __IPHONE_NA) + #include <qpa/qplatformfontdatabase.h> #include <private/qcore_mac_p.h> @@ -52,9 +56,11 @@ #include <CoreGraphics/CoreGraphics.h> #endif -#ifdef Q_OS_MACX +#if HAVE_CORETEXT Q_DECLARE_METATYPE(QCFType<CGFontRef>); Q_DECLARE_METATYPE(QCFType<CFURLRef>); +#endif +#if HAVE_ATS Q_DECLARE_METATYPE(ATSFontContainerRef); #endif @@ -69,9 +75,7 @@ public: QFontEngine *fontEngine(const QFontDef &fontDef, QChar::Script script, void *handle); QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference); QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const; -#ifdef Q_OS_MACX QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName); -#endif void releaseHandle(void *handle); QFont defaultFont() const; QList<int> standardSizes() const; @@ -84,9 +88,8 @@ private: mutable QHash<QString, QString> familyNameToPsName; void removeApplicationFonts(); -#ifdef Q_OS_MACX + QVector<QVariant> m_applicationFonts; -#endif }; QT_END_NAMESPACE |