From cb38007cd3b253fb2e3a8587ae9e64080e707a31 Mon Sep 17 00:00:00 2001
From: Eckhart Koppen <eckhart.koppen@nokia.com>
Date: Tue, 25 Jan 2011 15:11:33 +0200
Subject: Temporary fix for ambiguous cast from four letter char constant

---
 src/gui/text/qfontdatabase_s60.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index ad67189..97426a8 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -721,7 +721,7 @@ static inline bool ttfMarkAppFont(QByteArray &ttf, const QString &marker)
         memoryRanges.append(Range(offset, lengthAligned));
 
         quint32 checkSum = qFromBigEndian(tableRecord->checkSum);
-        if (tableRecord->tag == qToBigEndian('head')) {
+        if (tableRecord->tag == qToBigEndian(static_cast<quint32>('head'))) {
             if (length < ttfCheckSumAdjustmentOffset + sizeof(quint32))
                 return false; // Invalid 'head' table
             const quint32 *checkSumAdjustmentTag =
@@ -735,7 +735,7 @@ static inline bool ttfMarkAppFont(QByteArray &ttf, const QString &marker)
 
         bool updateTableChecksum = false;
         QByteArray table;
-        if (tableRecord->tag == qToBigEndian('name')) {
+        if (tableRecord->tag == qToBigEndian(static_cast<quint32>('name'))) {
             table = QByteArray(ttf.constData() + offset, length);
             if (!ttfMarkNameTable(table, marker))
                 return false; // Name table was not markable.
-- 
cgit v0.12