From ce761f45fe19db0fdb91743715fdc46e51e8a8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Mon, 27 Jan 2014 12:52:05 +0100
Subject: [PATCH] Fix nested template declarations for non-C++11 builds

Change-Id: Ie38aae09033a47106a4a1cf2e9997f90961a4e33
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 .../fontdatabases/mac/qcoretextfontdatabase.mm            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 826625da2d2..473fdf895a7 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