summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-01-27 12:52:05 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-27 13:16:53 +0100
commitce761f45fe19db0fdb91743715fdc46e51e8a8b3 (patch)
tree045f3144107f30223fc272ac70635db7042d584e
parentdd921b59ab45692a0774e8b914708c23ffcc52fe (diff)
Fix nested template declarations for non-C++11 builds
Change-Id: Ie38aae09033a47106a4a1cf2e9997f90961a4e33 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 826625da2d..473fdf895a 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -616,10 +616,10 @@ void QCoreTextFontDatabase::removeApplicationFonts()
#if HAVE_CORETEXT
if (&CTFontManagerUnregisterGraphicsFont && &CTFontManagerUnregisterFontsForURL) {
CFErrorRef error;
- if (font.canConvert(qMetaTypeId<QCFType<CGFontRef>>())) {
- CTFontManagerUnregisterGraphicsFont(font.value<QCFType<CGFontRef>>(), &error);
- } else if (font.canConvert(qMetaTypeId<QCFType<CFURLRef>>())) {
- CTFontManagerUnregisterFontsForURL(font.value<QCFType<CFURLRef>>(), kCTFontManagerScopeProcess, &error);
+ if (font.canConvert(qMetaTypeId<QCFType<CGFontRef> >())) {
+ CTFontManagerUnregisterGraphicsFont(font.value<QCFType<CGFontRef> >(), &error);
+ } else if (font.canConvert(qMetaTypeId<QCFType<CFURLRef> >())) {
+ CTFontManagerUnregisterFontsForURL(font.value<QCFType<CFURLRef> >(), kCTFontManagerScopeProcess, &error);
}
}
#endif