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

GLSL: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: Ib959a9aa39d8f87b0f0b5e297547913c1daa9c14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-02 21:43:57 +02:00
committed by Erik Verbruggen
parent abc8567198
commit 5f10acd5c9
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/glsl/glslparser.cpp
View File

@@ -162,7 +162,7 @@ AST *Parser::parse(int startToken)
QString message = QLatin1String("Syntax error");
if (yytoken != -1) {
const QLatin1String s(spell[yytoken]);
message = QString("Unexpected token `%1'").arg(s);
message = QString::fromLatin1("Unexpected token `%1'").arg(s);
}
for (; _tos; --_tos) {
@@ -182,7 +182,7 @@ AST *Parser::parse(int startToken)
if (next > 0) {
if (! yyrecovering && ! _recovered) {
_recovered = true;
error(line, QString("Expected `%1'").arg(QLatin1String(spell[*tptr])));
error(line, QString::fromLatin1("Expected `%1'").arg(QLatin1String(spell[*tptr])));
}
yyrecovering = 3;