From 6e5410e5b5e41e9360f70a66171ab819d9286cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Fri, 9 May 2014 15:12:19 +0200
Subject: qpa: merge qrawfont_qpa.cpp

Change-Id: I8552199c8b3e365adefbc2bb096c8153e222cec8
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 1c0e888758..be39767a8f 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -341,7 +341,7 @@ QFontEngine *QCoreTextFontDatabase::fontEngine(const QByteArray &fontData, qreal
 
     QFontEngine *fontEngine = NULL;
     if (cgFont == NULL) {
-        qWarning("QRawFont::platformLoadFromData: CGFontCreateWithDataProvider failed");
+        qWarning("QCoreTextFontDatabase::fontEngine: CGFontCreateWithDataProvider failed");
     } else {
         QFontDef def;
         def.pixelSize = pixelSize;
-- 
cgit v1.2.3