diff options
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 15 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 3 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 0032dc2aff..72486c097d 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -517,8 +517,9 @@ QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData CFRelease(font); return families; } - } else { -#else + } else +#endif + { ATSFontContainerRef fontContainer; OSStatus e; @@ -557,10 +558,7 @@ QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData m_applicationFonts.append(fontContainer); return families; } -#endif -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 } -#endif return QStringList(); } @@ -600,13 +598,14 @@ void QCoreTextFontDatabase::removeApplicationFonts() for (int i = 0; i < m_applicationURLFonts.count(); ++i) CTFontManagerUnregisterFontsForURL(m_applicationURLFonts[i], kCTFontManagerScopeProcess, &error); m_applicationURLFonts.clear(); - } -#else + } else +#endif + { for (int i = 0; i < m_applicationFonts.count(); ++i) ATSFontDeactivate(m_applicationFonts[i], 0, kATSOptionFlagsDoNotNotify); m_applicationFonts.clear(); ATSFontNotify(kATSFontNotifyActionFontsChanged, 0); -#endif + } #endif } diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index c3bb4d428a..ee1016509b 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -82,9 +82,8 @@ private: #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 QVector<QCFType<CGFontRef> > m_applicationGraphicsFonts; QVector<QCFType<CFURLRef> > m_applicationURLFonts; -#else - QVector<ATSFontContainerRef> m_applicationFonts; #endif + QVector<ATSFontContainerRef> m_applicationFonts; #endif }; |