From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Tue, 10 May 2011 11:06:57 +0000 (+0200)
Subject: Compile on Mac
X-Git-Tag: qt-v5.0.0-alpha1~4326^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0857b766772b2dac0d7ced5cbc2edd66f2cdcca;p=profile%2Fivi%2Fqtbase.git

Compile on Mac

Missing API update in Q_WS_MAC block

Reviewed-by: Jiang Jiang
(cherry picked from commit 4b95d9939db75d7bd55db4bbbf2d67af459f7eb5)
---

diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 4f2a01e..29394e9 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -593,11 +593,11 @@ QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writ
         // if none of them match, just pick the first one
         for (int i = 0; i < list.size(); i++) {
             QGlyphRun glyphs = list.at(i);
-            QRawFont rawfont = glyphs.font();
+            QRawFont rawfont = glyphs.rawFont();
             if (rawfont.familyName() == font.family())
                 return rawfont;
         }
-        return list.at(0).font();
+        return list.at(0).rawFont();
     }
     return QRawFont();
 #else