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

Fix tests compilation

Browse Source 
Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-03 20:48:18 +02:00
committed by Orgad Shaneh
parent 8ee43eeb1a
commit ef8787e59f
23 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/tools/qml-ast2dot/main.cpp
View File

@@ -58,7 +58,7 @@ public:
void operator()(const QString &fileName, const QByteArray &src, Node *ast) {
_src = src;
QString basename = fileName;
int dotIdx = basename.lastIndexOf('.');
int dotIdx = basename.lastIndexOf(QLatin1Char('.'));
if (dotIdx != -1)
basename.truncate(dotIdx);
basename.append(QLatin1String(".ast.dot"));
@@ -99,7 +99,7 @@ protected:
}
QString spell(const SourceLocation &token) {
return _src.mid(token.offset, token.length).replace('\'', "\\\\").replace('"', "\\\"");
return QString::fromLatin1(_src.mid(token.offset, token.length).replace('\'', "\\\\").replace('"', "\\\""));
}
void terminal(const SourceLocation &token) {
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
file.close();
Document::MutablePtr doc = Document::create(fileName, Document::guessLanguageFromSuffix(fileName));
doc->setSource(source);
doc->setSource(QString::fromUtf8(source));
doc->parse();
foreach (const DiagnosticMessage &m, doc->diagnosticMessages()) {