summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase_s60.cpp
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-01-25 15:11:33 +0200
committerAlessandro Portale <alessandro.portale@nokia.com>2011-01-25 15:54:39 +0100
commitcb38007cd3b253fb2e3a8587ae9e64080e707a31 (patch)
tree4ca429330a6960aefb027c9752f6c48d1eab86ec /src/gui/text/qfontdatabase_s60.cpp
parent41297f2d592ef21327b5c7523c52c1ecd3c727f4 (diff)
Temporary fix for ambiguous cast from four letter char constant
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
-rw-r--r--src/gui/text/qfontdatabase_s60.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index ad6718904f..97426a8b59 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.