diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-01-21 16:35:51 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-25 03:04:42 +0100 |
| commit | 5173589b795560c2042d06d191ac86ad61f24e51 (patch) | |
| tree | c1100029b2f3a89b973017a96bc5c74020daa124 /src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | |
| parent | a4a174e1a212bb934290853cf900594a18dba6bb (diff) | |
Use shared list of application fonts in CoreText font database
Instead of three separate lists depending on the font type. This
makes enables sharing more code between the different implementations.
Change-Id: If090d1b4a32f035b6344cbadd4c5ba66e0cb99f7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index ee1016509b..da0c1d338b 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -52,6 +52,12 @@ #include <CoreGraphics/CoreGraphics.h> #endif +#ifdef Q_OS_MACX +Q_DECLARE_METATYPE(QCFType<CGFontRef>); +Q_DECLARE_METATYPE(QCFType<CFURLRef>); +Q_DECLARE_METATYPE(ATSFontContainerRef); +#endif + QT_BEGIN_NAMESPACE class QCoreTextFontDatabase : public QPlatformFontDatabase @@ -79,11 +85,7 @@ private: void removeApplicationFonts(); #ifdef Q_OS_MACX -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - QVector<QCFType<CGFontRef> > m_applicationGraphicsFonts; - QVector<QCFType<CFURLRef> > m_applicationURLFonts; -#endif - QVector<ATSFontContainerRef> m_applicationFonts; + QVector<QVariant> m_applicationFonts; #endif }; |