feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSTools: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I370075ce75682ea11790a8f91339a01fb3c247f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-21 22:43:22 +02:00
committed by Friedemann Kleint
parent cdf5a10d4e
commit 75a3728254
11 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljstools/qmljslocatordata.cpp
View File

@@ -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;
}