From 41297f2d592ef21327b5c7523c52c1ecd3c727f4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 25 Jan 2011 13:49:46 +0200 Subject: Fix QMAKE_POST_LINK in Symbian for targets with special characters. Proper fixed targets was not used to generate the dependency for QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen before actual linking. Task-number: QTBUG-16881 Reviewed-by: axis --- qmake/generators/symbian/symmake_sbsv2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 6d01523..9eccd46 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -686,7 +686,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t fixFlmCmd(&postLinkCmd, commandsToReplace); t << "START EXTENSION qt/qmake_post_link" << endl; t << "OPTION POST_LINK_CMD " << postLinkCmd << endl; - t << "OPTION LINK_TARGET " << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".").append(getTargetExtension())) << endl; + t << "OPTION LINK_TARGET " << fixedTarget << QLatin1String(".") << getTargetExtension() << endl; t << "END" << endl; t << endl; } -- cgit v0.12 From cb38007cd3b253fb2e3a8587ae9e64080e707a31 Mon Sep 17 00:00:00 2001 From: Eckhart Koppen 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('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('name'))) { table = QByteArray(ttf.constData() + offset, length); if (!ttfMarkNameTable(table, marker)) return false; // Name table was not markable. -- cgit v0.12