From 75a3728254bc4016451038d519e7d078304e585a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 21 Nov 2012 22:43:22 +0200 Subject: QmlJSTools: Compile with QT_NO_CAST_FROM_ASCII Change-Id: I370075ce75682ea11790a8f91339a01fb3c247f9 Reviewed-by: Friedemann Kleint --- src/plugins/qmljstools/qmljslocatordata.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/qmljstools/qmljslocatordata.cpp') diff --git a/src/plugins/qmljstools/qmljslocatordata.cpp b/src/plugins/qmljstools/qmljslocatordata.cpp index 85ec59501e..d5bd9f10d9 100644 --- a/src/plugins/qmljstools/qmljslocatordata.cpp +++ b/src/plugins/qmljstools/qmljslocatordata.cpp @@ -82,7 +82,7 @@ public: protected: QString contextString(const QString &extra) { - return QString("%1, %2").arg(extra, m_documentContext); + return QString::fromLatin1("%1, %2").arg(extra, m_documentContext); } LocatorData::Entry basicEntry(SourceLocation loc) @@ -130,7 +130,7 @@ protected: m_entries += entry; - accept(ast->body, contextString(QString("function %1").arg(entry.displayName))); + accept(ast->body, contextString(QString::fromLatin1("function %1").arg(entry.displayName))); return false; } @@ -159,7 +159,7 @@ protected: QString context = toString(ast->qualifiedTypeNameId); const QString id = idOfObject(ast); if (!id.isEmpty()) - context = QString("%1 (%2)").arg(id, context); + context = QString::fromLatin1("%1 (%2)").arg(id, context); accept(ast->initializer, contextString(context)); return false; } @@ -172,7 +172,7 @@ protected: QString context = toString(ast->qualifiedTypeNameId); const QString id = idOfObject(ast); if (!id.isEmpty()) - context = QString("%1 (%2)").arg(id, context); + context = QString::fromLatin1("%1 (%2)").arg(id, context); accept(ast->initializer, contextString(context)); return false; } -- cgit v1.2.1