1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nested template declarations for non-C++11 builds

Browse Source 
Change-Id: Ie38aae09033a47106a4a1cf2e9997f90961a4e33
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Tor Arne Vestbø 2014-01-27 12:52:05 +01:00 committed by The Qt Project
parent dd921b59ab
commit ce761f45fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
View File

@ -616,10 +616,10 @@ void QCoreTextFontDatabase::removeApplicationFonts()
#if HAVE_CORETEXT #if HAVE_CORETEXT
if (&CTFontManagerUnregisterGraphicsFont && &CTFontManagerUnregisterFontsForURL) { if (&CTFontManagerUnregisterGraphicsFont && &CTFontManagerUnregisterFontsForURL) {
CFErrorRef error; CFErrorRef error;
if (font.canConvert(qMetaTypeId<QCFType<CGFontRef>>())) { if (font.canConvert(qMetaTypeId<QCFType<CGFontRef> >())) {
CTFontManagerUnregisterGraphicsFont(font.value<QCFType<CGFontRef>>(), &error); CTFontManagerUnregisterGraphicsFont(font.value<QCFType<CGFontRef> >(), &error);
} else if (font.canConvert(qMetaTypeId<QCFType<CFURLRef>>())) { } else if (font.canConvert(qMetaTypeId<QCFType<CFURLRef> >())) {
CTFontManagerUnregisterFontsForURL(font.value<QCFType<CFURLRef>>(), kCTFontManagerScopeProcess, &error); CTFontManagerUnregisterFontsForURL(font.value<QCFType<CFURLRef> >(), kCTFontManagerScopeProcess, &error);
} }
} }
#endif #endif