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

QmlJS: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I0c5654a978f47a4db5428936fd44633f21394830
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-27 20:20:02 +02:00
committed by Orgad Shaneh
parent 964c01a460
commit 5ea0937167
17 changed files with 416 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/qmljssimplereader.cpp
View File

@@ -145,7 +145,7 @@ bool SimpleAbstractStreamReader::readFromSource(const QString &source)
lexer.setCode(source, /*line = */ 1, /*qmlMode = */true);
if (!parser.parse()) {
QString errorMessage = QString("%1:%2: %3").arg(
QString errorMessage = QString::fromLatin1("%1:%2: %3").arg(
QString::number(parser.errorLineNumber()),
QString::number(parser.errorColumnNumber()),
parser.errorMessage());
@@ -162,7 +162,7 @@ QStringList SimpleAbstractStreamReader::errors() const
void SimpleAbstractStreamReader::addError(const QString &error, const AST::SourceLocation &sourceLocation)
{
m_errors << QString("%1:%2: %3\n").arg(
m_errors << QString::fromLatin1("%1:%2: %3\n").arg(
QString::number(sourceLocation.startLine),
QString::number(sourceLocation.startColumn),
error);