diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-01-25 13:11:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-26 07:36:26 (GMT) |
| commit | af44e4ff66558b4ae03248270557eb120c3b7d7c (patch) | |
| tree | 9c6730beb62b35fbf6389ca81d4a6363989a5f20 | |
| parent | bc1bc8e5cd7afa81a6680ee4b043753d8764e578 (diff) | |
| download | Qt-af44e4ff66558b4ae03248270557eb120c3b7d7c.zip Qt-af44e4ff66558b4ae03248270557eb120c3b7d7c.tar.gz Qt-af44e4ff66558b4ae03248270557eb120c3b7d7c.tar.bz2 | |
Temporary fix for ambiguous cast from four letter char constant
(cherry picked from commit cb38007cd3b253fb2e3a8587ae9e64080e707a31)
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 4 |
1 files 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. |